diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index e56b314..27da7b5 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -521,6 +521,7 @@
     </path>
 
     <path name="audio-recordC bt-mic">
+        <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
         <ctl name="EP1 TX Mixer BT_TX" value="1"/>
     </path>
 
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index ddc5857..f37ce2b 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -548,6 +548,7 @@
     </path>
 
     <path name="audio-recordC bt-mic">
+        <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
         <ctl name="EP1 TX Mixer BT_TX" value="1"/>
     </path>
 
diff --git a/device-oriole.mk b/device-oriole.mk
index 6f90e20..e8e1bca 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -107,3 +107,8 @@ endif
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=1
+
+# Hide cutout overlays
+PRODUCT_PACKAGES += \
+    NoCutoutOverlay \
+    AvoidAppsInCutoutOverlay
diff --git a/device-raven.mk b/device-raven.mk
index 8ef95c3..89074de 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -106,3 +106,8 @@ endif
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=1
+
+# Hide cutout overlays
+PRODUCT_PACKAGES += \
+    NoCutoutOverlay \
+    AvoidAppsInCutoutOverlay
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index a3317ee..8194bb4 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,6 +37,13 @@
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
 
+    <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
+         this value to 0 so it has no effect. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate. -->
+    <integer name="config_defaultPeakRefreshRate">90</integer>
+
     <!-- Nonlinear coefficients for maximum panel brightness of 500 nits -->
     <string-array name="config_reduceBrightColorsCoefficientsNonlinear">
         <!-- a-coefficient --> <item>-0.4553233597</item>
@@ -180,7 +187,4 @@
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
-    <!-- The default peak refresh rate. -->
-    <integer name="config_defaultPeakRefreshRate">90</integer>
-
 </resources>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index f8536b0..91fed9e 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -86,6 +86,13 @@
          Must be in the range specified by minimum and maximum. -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
 
+    <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
+         this value to 0 so it has no effect. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate. -->
+    <integer name="config_defaultPeakRefreshRate">120</integer>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]
@@ -158,4 +165,5 @@
     <string name="config_mms_user_agent" translatable="false">g8v0u</string>
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G8V0U.xml</string>
+
 </resources>
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 26a1b38..a9766c5 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -15,6 +15,36 @@
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
+        {
+            "Name":"rf1_therm",
+            "Type":"UNKNOWN",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"rf2_therm",
+            "Type":"UNKNOWN",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
@@ -243,8 +273,8 @@
                 0.0,
                 0.0,
                 0.0,
-                0.0,
                 1.9,
+                0.0,
                 0.0
             ],
             "VrThreshold":"NAN",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 4eb649c..ba3a340 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -15,6 +15,36 @@
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
+        {
+            "Name":"rf1_therm",
+            "Type":"UNKNOWN",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"rf2_therm",
+            "Type":"UNKNOWN",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
@@ -243,8 +273,8 @@
                 0.0,
                 0.0,
                 0.0,
-                0.0,
                 1.9,
+                0.0,
                 0.0
             ],
             "VrThreshold":"NAN",