diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 1747d8b..64238c7 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -26,6 +26,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ext</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>hardware.google.bluetooth.ccc</name>
         <transport>hwbinder</transport>
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 ccdac8d..9913b4c 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -175,6 +175,9 @@
     <!-- 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>
 
+    <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
+    <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
+
     <!-- How long it takes for the HW to start illuminating after the illumination is requested.
       It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 120 Hz screen
       refresh rate equates to a 25 ms delay. -->
diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 2b1408d..ac43e1a 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -4,6 +4,7 @@ on init
     # NFC streset tool name
     setprop persist.vendor.nfc.streset libstreset21
     setprop persist.vendor.se.streset libstreset21
+    setprop persist.vendor.se.reset needed
 
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 31de31a..0e3a524 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -149,6 +149,10 @@ PRODUCT_PACKAGES += \
 	libspatialaudio \
 	librondo
 
+# Bluetooth hci_inject test tool
+PRODUCT_PACKAGES_DEBUG += \
+    hci_inject
+
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
 
diff --git a/device-panther.mk b/device-panther.mk
index f7ae787..9312a70 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -131,6 +131,10 @@ PRODUCT_PACKAGES += \
 	libspatialaudio \
 	librondo
 
+# Bluetooth hci_inject test tool
+PRODUCT_PACKAGES_DEBUG += \
+    hci_inject
+
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
 
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 feb2737..02bb86c 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -193,6 +193,9 @@
     <!-- 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>
 
+    <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
+    <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
+
     <!-- How long it takes for the HW to start illuminating after the illumination is requested.
       It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 90 Hz screen
       refresh rate equates to a 34 ms delay. -->
diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 51cc1ef..79ef6ff 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -143,6 +143,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "SFUClampBoost",
       "Path": "/proc/vendor_sched/sf_uclamp_min",
@@ -555,6 +564,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 5af78dd..4138867 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -112,6 +112,24 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -143,6 +161,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "SFUClampBoost",
       "Path": "/proc/vendor_sched/sf_uclamp_min",
@@ -508,6 +535,18 @@
       "Duration": 5000,
       "Value": "85"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",
@@ -555,6 +594,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index d6c1f96..ca9d2c7 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -132,6 +132,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -399,6 +408,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index d1e52c4..6e6d422 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -143,6 +143,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "SFUClampBoost",
       "Path": "/proc/vendor_sched/sf_uclamp_min",
@@ -544,6 +553,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 77aba7e..4fe9966 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -112,6 +112,24 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -143,6 +161,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "SFUClampBoost",
       "Path": "/proc/vendor_sched/sf_uclamp_min",
@@ -508,6 +535,18 @@
       "Duration": 5000,
       "Value": "85"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
@@ -544,6 +583,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json
index 2cd08a8..cdbea42 100644
--- a/powerhint-ravenclaw.json
+++ b/powerhint-ravenclaw.json
@@ -132,6 +132,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "FGUClampBoost",
+      "Path": "/proc/vendor_sched/fg_uclamp_min",
+      "Values": [
+        "159",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -399,6 +408,12 @@
       "Duration": 5000,
       "Value": "553"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "FGUClampBoost",
+      "Duration": 5000,
+      "Value": "159"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "MemFreq",
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index ad42911..ccd10b7 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -62,8 +62,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["gnss_tcxo_therm", "disp_therm"],
-            "Coefficient":[0.6, 0.4],
-            "Offset":-200,
+            "Coefficient":[0.550, 0.450],
+            "Offset":-1000,
             "Multiplier":0.001
         },
         {
@@ -84,8 +84,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["quiet_therm","usb_pwr_therm2"],
-            "Coefficient":[1.1, -0.1],
-            "Offset":-900,
+            "Coefficient":[0.9, 0.1],
+            "Offset":-1200,
             "Multiplier":0.001
         },
         {
@@ -124,7 +124,7 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"0.6",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 4719c03..03f9bd3 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -124,7 +124,7 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"0.6",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",