diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 5f65034..d887c08 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -193,11 +193,11 @@
                 <route type="mix" sink="Speaker Safe"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Device Out"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Dock"
@@ -205,11 +205,11 @@
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@@ -220,9 +220,9 @@
                 <route type="mix" sink="voip_tx"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
                 <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 319c16f..d78ae11 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -184,11 +184,11 @@
                 <route type="mix" sink="USB Dock"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@@ -199,9 +199,9 @@
                 <route type="mix" sink="voip_tx"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
                 <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 8a92d35..b321568 100644
--- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -180,11 +180,11 @@
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
@@ -195,9 +195,9 @@
                 <route type="mix" sink="voip_tx"
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
                 <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index ff12b83..a252a43 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -187,6 +187,7 @@
     <ctl name="BT_RX Mixer EP7" value="0"/>
     <ctl name="BT_RX Mixer NoHost1" value="0"/>
     <ctl name="BT_RX Mixer VOIP" value="0"/>
+    <ctl name="BT_RX Mixer RAW" value="0"/>
 
     <ctl name="INCALL_RX Mixer EP1" value="0"/>
     <ctl name="INCALL_RX Mixer EP2" value="0"/>
@@ -444,6 +445,10 @@
         <ctl name="USB_RX Mixer RAW" value="1"/>
     </path>
 
+    <path name="raw-playbackP bt">
+        <ctl name="BT_RX Mixer RAW" value="1"/>
+    </path>
+
     <path name="raw-playbackP hearing-aid">
     </path>
 
@@ -462,6 +467,10 @@
         <ctl name="USB_RX Mixer EP1" value="1"/>
     </path>
 
+    <path name="mmap-playbackP bt">
+        <ctl name="BT_RX Mixer EP1" value="1"/>
+    </path>
+
     <path name="mmap-playbackP usb-tty-full">
     </path>
 
@@ -694,6 +703,10 @@
         <ctl name="EP3 TX Mixer USB_TX" value="1"/>
     </path>
 
+    <path name="low-latency-recordC bt-mic">
+        <ctl name="EP3 TX Mixer BT_TX" value="1"/>
+    </path>
+
     <path name="mmap-recordC">
         <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
     </path>
@@ -702,6 +715,10 @@
         <ctl name="EP2 TX Mixer USB_TX" value="1"/>
     </path>
 
+    <path name="mmap-recordC bt-mic">
+        <ctl name="EP2 TX Mixer BT_TX" value="1"/>
+    </path>
+
     <!-- codec setting -->>
     <!-- Rx device -->
     <path name="handset">
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index fd124d4..3b234d6 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -243,6 +243,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.odm.cast.ssid_suffix=ynn
 
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.camera.bypass_sensor_binning_resolution_condition=1 \
     persist.vendor.camera.extended_launch_boost=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1
 
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 57221c5..6c6cc3c 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -124,4 +124,9 @@
          1: verbose logging on by default for userdebug
          2: verbose logging on by default for all builds -->
     <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code and driver country code is 00.
+         This is applied only during the setup wizard -->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
 </resources>