diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
diff --git a/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..3a05753e 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">157px</dimen>
+    <dimen name="rounded_corner_radius_top">157px</dimen>
+    <dimen name="rounded_corner_radius_bottom">157px</dimen>
 </resources>
diff --git a/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml b/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..ddb2caf5 100644
--- a/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">153px</dimen>
+    <dimen name="rounded_corner_radius_top">153px</dimen>
+    <dimen name="rounded_corner_radius_bottom">153px</dimen>
 </resources>
diff --git a/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml b/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..c498bcdc 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">132px</dimen>
+    <dimen name="rounded_corner_radius_top">132px</dimen>
+    <dimen name="rounded_corner_radius_bottom">132px</dimen>
 </resources>
diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index f91150bf..4ef5dd2e 100644
--- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -29,7 +29,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)*(1800-2)+2 = 2 nits -->
         <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1800-2)+2 = 9.08 nits -->
         <item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1800-2)+2 = 51.55 nits -->
         <item>8</item> <!-- 4: SUN -->
@@ -41,7 +41,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 -->