diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index 0d57183..6aa776d 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -100,9 +100,6 @@
            be checked via NL80211 interface -->
     <bool translatable="false" name="config_wifi11axSupportOverride">true</bool>
 
-    <!-- Wifi driver supports 6GHz band for softap -->
-    <bool translatable="false" name="config_wifiSoftap6ghzSupported">true</bool>
-
     <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
     <bool translatable="false" name="config_wifi_softap_sae_supported">true</bool>
 
diff --git a/location/gps.xml b/location/gps.xml
index d0fcfdb..8782a68 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index b119e7f..96def77 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 760d30b..7e0f394 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 266b53b..af4361a 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index d9ca029..81dd6dc 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 53fe55c..98b913f 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index 6831e5b..9682014 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -100,9 +100,6 @@
            be checked via NL80211 interface -->
     <bool translatable="false" name="config_wifi11axSupportOverride">true</bool>
 
-    <!-- Wifi driver supports 6GHz band for softap -->
-    <bool translatable="false" name="config_wifiSoftap6ghzSupported">true</bool>
-
     <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
     <bool translatable="false" name="config_wifi_softap_sae_supported">true</bool>
 
diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 09d4fcd..8707576 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -103,6 +103,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -784,6 +785,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 1d0cb50..33debac 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -103,6 +103,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -783,6 +784,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index cf0157e..b7fc8bd 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -90,6 +90,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -623,6 +624,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index 1c7a853..617473b 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -103,6 +103,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -772,6 +773,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 98da014..b3b9c25 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -103,6 +103,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -771,6 +772,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",
diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json
index 9235e7f..828a224 100644
--- a/powerhint-ravenclaw.json
+++ b/powerhint-ravenclaw.json
@@ -90,6 +90,7 @@
       "Name": "GPUMinFreq",
       "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
       "Values": [
+        "848000",
         "762000",
         "471000",
         "400000",
@@ -623,6 +624,12 @@
       "Duration": 3000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME",
+      "Node": "GPUMinFreq",
+      "Duration": 3000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPULittleClusterMaxFreq",