diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml
index 5700502..9314da8 100644
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -71,6 +71,7 @@
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
+      <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml
index 5700502..9314da8 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -71,6 +71,7 @@
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
+      <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
diff --git a/device-husky.mk b/device-husky.mk
index 5d4a442..780586d 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -158,12 +158,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=29 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=16 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # Spatial Audio
diff --git a/device-shiba.mk b/device-shiba.mk
index e9ed36b..3cc02ce 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -149,12 +149,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=29 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=16 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # Spatial Audio
diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 60c4da6..8cec238 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,4 +23,9 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">1040px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1174px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
+         display size. -->
+    <dimen name="lock_icon_padding">57px</dimen>
+
+    <dimen name="udfps_burn_in_offset_y">19px</dimen>
 </resources>
diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 408d919..0592ba2 100644
--- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,4 +23,11 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">1000px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1160px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
+         display size. -->
+    <dimen name="lock_icon_padding">50px</dimen>
+
+    <!-- Offset should not be more than 1mm -->
+    <dimen name="udfps_burn_in_offset_x">6px</dimen>
+    <dimen name="udfps_burn_in_offset_y">17px</dimen>
 </resources>