diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 4f9363bb..aa50be56 100644
--- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,6 +23,6 @@
     <item name="pixel_pitch" format="float" type="dimen">51.3</item>
 
     <!-- Volume panel corner radius -->
-    <dimen name="volume_panel_corner_radius">52dp</dimen>
+    <dimen name="bottom_sheet_corner_radius">52dp</dimen>
 </resources>
 
diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index eb1c3d1d..bd39bc1b 100644
--- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,6 +23,6 @@
     <item name="pixel_pitch" format="float" type="dimen">52.28</item>
 
     <!-- Volume panel corner radius -->
-    <dimen name="volume_panel_corner_radius">52dp</dimen>
+    <dimen name="bottom_sheet_corner_radius">52dp</dimen>
 </resources>
 
diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index a491857a..29423671 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index f111061b..b375022b 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index 147be4e4..006415d8 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index ce675df0..095b4f9a 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 861a3a33..b78870c6 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index 21a27f5d..c4b45c80 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index 861a3a33..b78870c6 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index 78d07d4a..0894531b 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index 2adc1410..9364254a 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 621fef15..3630bcf7 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600
diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 24e5a683..4f05dd15 100644
--- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,6 +23,6 @@
     <item name="pixel_pitch" format="float" type="dimen">60.16</item>
 
     <!-- Volume panel corner radius -->
-    <dimen name="volume_panel_corner_radius">52dp</dimen>
+    <dimen name="bottom_sheet_corner_radius">52dp</dimen>
 </resources>