diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index f75dff3..2c82b65 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -147,4 +147,7 @@
     <string name="config_mms_user_agent" translatable="false">ge2ae</string>
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GE2AE.xml</string>
+
+    <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
+    <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
 </resources>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index c97eae8..65b2c2d 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -194,3 +194,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2
+
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.support_hide_display_cutout=true
+
+PRODUCT_PACKAGES += \
+    NoCutoutOverlay \
+    AvoidAppsInCutoutOverlay
diff --git a/device-panther.mk b/device-panther.mk
index 6401547..85b72a0 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -185,3 +185,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2
+
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.support_hide_display_cutout=true
+
+PRODUCT_PACKAGES += \
+    NoCutoutOverlay \
+    AvoidAppsInCutoutOverlay
diff --git a/manifest.xml b/manifest.xml
index 44cd753..73b4e42 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -143,7 +143,7 @@
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index aa2803f..ee6c6bb 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -146,4 +146,7 @@
     <string name="config_mms_user_agent" translatable="false">gqml3</string>
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GQML3.xml</string>
+
+    <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
+    <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
 </resources>
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 5b3d4b1..7281a6c 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -276,7 +276,7 @@
                 "45",
                 "46.5",
                 "52.0",
-                "150.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -335,7 +335,7 @@
                 "43.0",
                 "45.0",
                 "47.0",
-                "150.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -354,10 +354,73 @@
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                    "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
+                },
+                {
+                    "CdevRequest": "dc_icl",
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
+                },
+                {
+                    "CdevRequest": "wlc_fcc",
+                    "LimitInfo": [0, 3, 3, 4, 5, 5, 5],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
                 }
             ]
         },
+        {
+            "Name":"cellular-emergency",
+            "Type":"POWER_AMPLIFIER",
+            "VirtualSensor":true,
+            "TriggerSensor":"quiet_therm",
+            "Formula":"MAXIMUM",
+            "Combination":[
+                "VIRTUAL-QI-USB",
+                "VIRTUAL-USB2-QUIET",
+                "VIRTUAL-QUIET-USB2"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "54.0",
+                "NAN"
+            ],
+            "HotHysteresis":[
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.9,
+                0.0
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001,
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":7000
+        },
         {
             "Name":"LITTLE",
             "Type":"CPU",
@@ -945,6 +1008,14 @@
             "Name":"fcc",
             "Type":"BATTERY"
         },
+        {
+            "Name":"dc_icl",
+            "Type":"BATTERY"
+        },
+        {
+            "Name":"wlc_fcc",
+            "Type":"BATTERY"
+        },
         {
             "Name":"tpu_cooling",
             "Type":"NPU",
@@ -984,6 +1055,31 @@
             "Name":"S2S_VDD_G3D",
             "PowerSampleDelay":14000,
             "PowerSampleCount":5
+        },
+        {
+            "Name":"POWER_FOR_CHARGING_THROTTLING",
+            "VirtualRails":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "VSYS_PWR_MODEM",
+                "S2M_VDD_CPUCL2",
+                "S3M_VDD_CPUCL1",
+                "S4M_VDD_CPUCL0",
+                "S5M_VDD_INT",
+                "S1M_VDD_MIF",
+                "S2S_VDD_G3D"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "PowerSampleDelay":14000,
+            "PowerSampleCount":5
         }
     ]
 }
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 9ad6913..d500b15 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -302,7 +302,7 @@
                 "45.0",
                 "46.5",
                 "52.0",
-                "150.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -363,7 +363,7 @@
                 "43.0",
                 "45.0",
                 "47.0",
-                "150.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -382,10 +382,73 @@
             "BindedCdevInfo": [
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                    "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
+                },
+                {
+                    "CdevRequest": "dc_icl",
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
+                },
+                {
+                    "CdevRequest": "wlc_fcc",
+                    "LimitInfo": [0, 2, 2, 4, 5, 5, 5],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
                 }
             ]
         },
+        {
+            "Name":"cellular-emergency",
+            "Type":"POWER_AMPLIFIER",
+            "VirtualSensor":true,
+            "TriggerSensor":"quiet_therm",
+            "Formula":"MAXIMUM",
+            "Combination":[
+                "VIRTUAL-QI-USB",
+                "VIRTUAL-USB-QUIET",
+                "VIRTUAL-GNSS-USB2"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "54.0",
+                "NAN"
+            ],
+            "HotHysteresis":[
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.9,
+                0.0
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001,
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":7000
+        },
         {
             "Name":"LITTLE",
             "Type":"CPU",
@@ -973,6 +1036,14 @@
             "Name":"fcc",
             "Type":"BATTERY"
         },
+        {
+            "Name":"dc_icl",
+            "Type":"BATTERY"
+        },
+        {
+            "Name":"wlc_fcc",
+            "Type":"BATTERY"
+        },
         {
             "Name":"tpu_cooling",
             "Type":"NPU",
@@ -1012,6 +1083,31 @@
             "Name":"S2S_VDD_G3D",
             "PowerSampleDelay":14000,
             "PowerSampleCount":5
+        },
+        {
+            "Name":"POWER_FOR_CHARGING_THROTTLING",
+            "VirtualRails":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "VSYS_PWR_MODEM",
+                "S2M_VDD_CPUCL2",
+                "S3M_VDD_CPUCL1",
+                "S4M_VDD_CPUCL0",
+                "S5M_VDD_INT",
+                "S1M_VDD_MIF",
+                "S2S_VDD_G3D"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "PowerSampleDelay":14000,
+            "PowerSampleCount":5
         }
     ]
 }
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 67439ab..dcc44c1 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -19,4 +19,3 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
-    vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \