diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 7183af01..a494a928 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -884,6 +884,8 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote
     chown system system /dev/thermal/cdev-by-name/tpu_cooling/user_vote
     chown system system /dev/thermal/cdev-by-name/fcc/cur_state
+    chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state
+    chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
 
 on property:vendor.disable.bcl.control=1
     write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0
diff --git a/default-permissions.xml b/default-permissions.xml
index 2372bd67..2641aa47 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -76,6 +76,8 @@
         <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
         <!-- Used to set up a Wi-Fi P2P network -->
         <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
     <exception
@@ -114,6 +116,15 @@
         <!-- Microphone: To hear user's voice commands -->
         <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
     </exception>
-
+    <exception
+        package="com.google.android.deskclock">
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+    </exception>
+    <exception
+        package="com.google.android.apps.tips">
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+    </exception>
 </exceptions>
 
diff --git a/device.mk b/device.mk
index a87b066b..a992ba33 100644
--- a/device.mk
+++ b/device.mk
@@ -609,6 +609,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.early.sf.duration=16600000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.early.app.duration=16600000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.sf.duration=16600000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.app.duration=16600000
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.frame_rate_multiple_threshold=120
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_layer_caching=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80
@@ -850,6 +851,8 @@ SIM_COUNT := 2
 SUPPORT_MULTI_SIM := true
 # Support NR
 SUPPORT_NR := true
+# Support 5G on both stacks
+SUPPORT_NR_DS := true
 # Using IRadio 1.6
 USE_RADIO_HAL_1_6 := true
 
@@ -915,7 +918,7 @@ PRODUCT_PACKAGES += \
 	android.hardware.audio@7.1-impl \
 	android.hardware.audio.effect@7.0-impl \
 	android.hardware.soundtrigger@2.3-impl \
-	vendor.google.whitechapel.audio.audioext@2.0-impl \
+	vendor.google.whitechapel.audio.audioext@3.0-impl \
 	android.hardware.bluetooth.audio@2.1-impl
 
 #
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c660eda1..a8f77006 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -143,7 +143,7 @@
     </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index f859c7b9..4ae12513 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -154,7 +154,7 @@
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 566d80b2..bdf68411 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -114,7 +114,7 @@
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>