diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index 39e5550..a1c8e62 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/bluetooth/bluetooth_power_limits_L10_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
 
 # Bluetooth SAR test tools
-ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1)$(TARGET_USE_QTI_BT_SAR),true)
+ifneq (,$(filter true, $(TARGET_USE_QTI_BT_SAR_V1_1) $(TARGET_USE_QTI_BT_SAR)))
    PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test
 endif
 
diff --git a/device-lynx.mk b/device-lynx.mk
index d21f38d..ce7e91f 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -103,7 +103,9 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 
 # PowerStats HAL
-PRODUCT_SOONG_NAMESPACES += device/google/lynx/powerstats
+PRODUCT_SOONG_NAMESPACES += \
+    device/google/lynx/powerstats \
+    device/google/lynx
 
 # Bluetooth HAL and Pixel extension
 include device/google/lynx/bluetooth/qti_default.mk
@@ -224,6 +226,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.1080P_60fps_binning_except_rear_main=true
 
+# Increase thread priority for nodes stop
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.increase_thread_priority_nodes_stop=true
+
 # OIS with system imu
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.ois_with_system_imu=true
@@ -241,3 +247,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
         device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
 endif
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayG82U8
diff --git a/lynx/overlay_packages/SettingsOverlayG82U8/Android.bp b/lynx/overlay_packages/SettingsOverlayG82U8/Android.bp
new file mode 100644
index 0000000..1af1f37
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayG82U8/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayG82U8",
+    product_specific: true,
+}
diff --git a/lynx/overlay_packages/SettingsOverlayG82U8/AndroidManifest.xml b/lynx/overlay_packages/SettingsOverlayG82U8/AndroidManifest.xml
new file mode 100644
index 0000000..8cb5a67
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayG82U8/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.g82u8">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G82U8"
+             android:isStatic="true" />
+</manifest>
diff --git a/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png b/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..cfc010e
Binary files /dev/null and b/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png differ