diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 8133645..3604324 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -20,6 +20,12 @@
       <argument name="Name" value="BCL_AUDIO_BAACL" />
       <argument name="Strategy" value="MediaSpeakerAndScreenOn" />
     </feature>
+    <feature name="BatteryMitigation">
+      <argument name="TargetDigitalVolume" value="809" />
+      <argument name="PcmRampMs" value="15ms" />
+      <argument name="ThrottleDurationMs" value="3000" />
+      <argument name="ThrottleMitigationLevel" value="LIGHT" />
+    </feature>
     <feature name="PlaybackThermalThrottle">
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
index 7d6a7bb..85771ce 100644
Binary files a/audio/comet/tuning/spatializer/base and b/audio/comet/tuning/spatializer/base differ
diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml
index 2aa58e4..4b1a78f 100644
--- a/comet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -238,15 +238,15 @@
 
     <!-- Radius of the software rounded corners at the top of primary display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_top">52px</dimen>
+    <dimen name="rounded_corner_radius_top">85px</dimen>
     <!-- For secondary display -->
-    <dimen name="secondary_rounded_corner_radius_top">91px</dimen>
+    <dimen name="secondary_rounded_corner_radius_top">115px</dimen>
 
     <!-- Radius of the software rounded corners at the bottom of primary display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_bottom">48px</dimen>
+    <dimen name="rounded_corner_radius_bottom">85px</dimen>
     <!-- For secondary display -->
-    <dimen name="secondary_rounded_corner_radius_bottom">91px</dimen>
+    <dimen name="secondary_rounded_corner_radius_bottom">115px</dimen>
 
     <!-- A string config in svg path format for the main display shape.
          (@see https://www.w3.org/TR/SVG/paths.html#PathData).
diff --git a/device-comet.mk b/device-comet.mk
index d44d4b7..4b9f3c6 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -328,13 +328,19 @@ PRODUCT_VENDOR_PROPERTIES += \
 # remove pm.activetimeout
 # ro.vendor.vibrator.hal.loc.coeff.folded currently unused
 ACTUATOR_MODEL := luxshare_ict_081545
+ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.chirp.enabled=1 \
     ro.vendor.vibrator.hal.device.mass=0.2605 \
     ro.vendor.vibrator.hal.loc.coeff.folded=3.15 \
     ro.vendor.vibrator.hal.loc.coeff=2.58 \
     ro.vendor.vibrator.hal.dbc.enable=1 \
-    ro.vendor.vibrator.hal.pm.activetimeout=5
+    ro.vendor.vibrator.hal.pm.activetimeout=5 \
+    persist.vendor.vibrator.hal.context.enable=false \
+    persist.vendor.vibrator.hal.context.scale=60 \
+    persist.vendor.vibrator.hal.context.fade=true \
+    persist.vendor.vibrator.hal.context.cooldowntime=1600 \
+    persist.vendor.vibrator.hal.context.settlingtime=5000
 
 # Hinge angle sensor
 PRODUCT_COPY_FILES += \
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 298d12d..96d623a 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -187,4 +187,10 @@
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
 
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
 </resources>