diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
index 0bdaff2..8018d02 100644
Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index 64b3d85..d40e099 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 9343381..e593d7e 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,7 +14,7 @@ UserialTypePriority = 2-1
 BtOffloadCap = AOC
 
 # <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 24F_AOC
+BtOffloadTrunkGroup = 24P_AOC
 
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true
diff --git a/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml b/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
index 2c1fcc8..1ac9250 100644
--- a/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
+++ b/comet/overlay/frameworks/base/packages/SystemUI/res/values-sw820dp/dimens.xml
@@ -18,7 +18,7 @@
     <dimen name="status_bar_padding_start">0dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">620px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">675px</dimen>
 
     <!-- Location on the screen of the center of the physical fingerprint sensor -->
     <dimen name="physical_fingerprint_sensor_center_screen_location_x">2076px</dimen>
diff --git a/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 689640c..41b7fe8 100644
--- a/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/comet/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,7 +17,7 @@
 -->
 <resources>
     <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">710px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">765px</dimen>
 
     <!-- Location on the screen of the center of the physical fingerprint sensor -->
     <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</dimen>
diff --git a/device-comet.mk b/device-comet.mk
index 42299bd..493ec31 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -343,6 +343,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/comet/powerstats/comet
 
+# UWB Overlay
+PRODUCT_PACKAGES += \
+	UwbOverlayCT3
+
 # WiFi Overlay
 PRODUCT_PACKAGES += \
 	WifiOverlay2024Mid_CT3 \
@@ -513,12 +517,13 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
 
-# Connectivity Resources Overlay
+# Connectivity Resources Overlay for Thread host settings
 PRODUCT_PACKAGES += \
     ConnectivityResourcesOverlayCometOverride
 
+# Thread Dispatcher enablement in Bluetooth HAL
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.thread_dispatcher.enabled=true
+    persist.bluetooth.thread_dispatcher.enabled=false
 
 # Camera concurrent foldable dual front feature support
 PRODUCT_PACKAGES += \
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 4d23759..859944c 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -79,6 +79,10 @@ SingleBandNmTrkPower=20
 MultiBandNmTrkPower=28
 SingleBandUdTrkPower=14
 MultiBandUdTrkPower=18
+path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
+path_delay_gps_2fx_cm = 12342
+path_delay_bds_4fx_cm = 123
+path_delay_l5_20fx_cm = 105916
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 7bc7d36..26d28a7 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -219,6 +219,11 @@ MultiBandNmTrkPower=28
 SingleBandUdTrkPower=14
 MultiBandUdTrkPower=18
 
+path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
+path_delay_gps_2fx_cm = 12342
+path_delay_bds_4fx_cm = 123
+path_delay_l5_20fx_cm = 105916
+
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
index bf8d264..a1d0fda 100644
--- a/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -30,4 +30,12 @@
        * When previously foreground 3p apps moves to background, sessions are not terminated
     -->
     <bool name = "background_ranging_enabled">true</bool>
+
+    <!-- Whether multicast list update notification v2 is supported or not.
+     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+
+    <!-- Whether multicast list update response v2 is supported or not.
+     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>