diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 44a26777..886c8376 100644
--- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -43,7 +43,7 @@
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
         <item>-1</item> <!-- 0: OFF -->
-        <item>2</item> <!-- 1: NIGHT -->
+        <item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(1850-2)+2 = 2 nits -->
         <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1850-2)+2 = 9.2 nits -->
         <item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1850-2)+2 = 52.9 nits -->
         <item>8</item> <!-- 4: SUN -->
@@ -55,7 +55,7 @@
                -1 means keeping the current opacity. -->
     <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
         <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
+        <item>0</item> <!-- 1: NIGHT -->
         <item>0</item> <!-- 2: LOW -->
         <item>0</item> <!-- 3: HIGH -->
         <item>0</item> <!-- 4: SUN -->
diff --git a/conf/init.ripcurrentpro.rc b/conf/init.ripcurrentpro.rc
index abfb7420..8382c594 100644
--- a/conf/init.ripcurrentpro.rc
+++ b/conf/init.ripcurrentpro.rc
@@ -44,15 +44,25 @@ on property:vendor.all.modules.ready=1
     chown system system /mnt/vendor/persist/haptics
     chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal
 
-    chown system system /sys/bus/i2c/devices/9-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/9-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/9-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/9-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/9-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/9-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/9-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/9-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/9-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/9-0042/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0042/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0042/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0042/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0042/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0042/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0042/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0042/default/delay_before_stop_playback_us
 
     enable vendor.vibrator.cs40l26-dual
diff --git a/device-caiman.mk b/device-caiman.mk
index 26516ca5..67fcf9ac 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -270,9 +270,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_PACKAGES += \
     libthermal_tflite_wrapper
 
-# Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
-	vendor.zram.size=50p \
 	persist.device_config.configuration.disable_rescue_party=true
 
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 58e99bc5..4411ce5e 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -289,9 +289,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_PACKAGES += \
     libthermal_tflite_wrapper
 
-# Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
-	vendor.zram.size=50p \
 	persist.device_config.configuration.disable_rescue_party=true
 
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index d30b74fd..37d67c53 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -223,9 +223,7 @@ PRODUCT_PACKAGES += \
 	scd.conf \
 	lhd.conf
 
-# Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
-	vendor.zram.size=50p \
 	vendor.disable.thermal.control=1 \
 	persist.device_config.configuration.disable_rescue_party=true
 
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 73929c29..26a9120d 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -224,9 +224,7 @@ PRODUCT_PACKAGES += \
 	scd.conf \
 	lhd.conf
 
-# Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
-	vendor.zram.size=50p \
 	persist.device_config.configuration.disable_rescue_party=true
 
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 9cd3b866..e4aaac46 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -259,9 +259,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_PACKAGES += \
     libthermal_tflite_wrapper
 
-# Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
-	vendor.zram.size=50p \
 	persist.device_config.configuration.disable_rescue_party=true
 
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index e7962caf..4f7748a5 100644
--- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -43,7 +43,7 @@
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
         <item>-1</item> <!-- 0: OFF -->
-        <item>2</item> <!-- 1: NIGHT -->
+        <item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(1850-2)+2 = 2 nits -->
         <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1850-2)+2 = 9.2 nits -->
         <item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1850-2)+2 = 52.9 nits -->
         <item>8</item> <!-- 4: SUN -->
@@ -55,7 +55,7 @@
                -1 means keeping the current opacity. -->
     <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
         <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
+        <item>0</item> <!-- 1: NIGHT -->
         <item>0</item> <!-- 2: LOW -->
         <item>0</item> <!-- 3: HIGH -->
         <item>0</item> <!-- 4: SUN -->
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 50f1951b..34bec227 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -1114,6 +1114,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1630,6 +1636,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1792,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1898,7 +1916,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam3"
+      "Value": "cam2"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1916,7 +1934,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2074,6 +2092,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2531,6 +2555,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 50f1951b..34bec227 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -1114,6 +1114,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1630,6 +1636,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1792,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1898,7 +1916,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam3"
+      "Value": "cam2"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1916,7 +1934,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2074,6 +2092,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2531,6 +2555,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-ripcurrent24.json b/perf/powerhint-ripcurrent24.json
index 382cda60..7fd50413 100644
--- a/perf/powerhint-ripcurrent24.json
+++ b/perf/powerhint-ripcurrent24.json
@@ -1090,6 +1090,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1228,6 +1234,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1322,7 +1334,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 0bdc06e5..0ec61fb7 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -1114,6 +1114,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1630,6 +1636,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1792,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1898,7 +1916,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam3"
+      "Value": "cam2"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1916,7 +1934,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2074,6 +2092,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2531,6 +2555,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 50f1951b..34bec227 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -1114,6 +1114,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1630,6 +1636,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1792,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1898,7 +1916,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam3"
+      "Value": "cam2"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1916,7 +1934,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2074,6 +2092,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2531,6 +2555,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json
index 0b5b35a7..aeca1e72 100644
--- a/perf/powerhint-zuma.json
+++ b/perf/powerhint-zuma.json
@@ -1084,6 +1084,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1600,6 +1606,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1762,6 +1774,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -2038,6 +2056,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2495,6 +2519,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "ReducePreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",