diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index 649aed21..8eb240a7 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -81,8 +81,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -96,9 +96,11 @@
 
     <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
 
-    <latency source="microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index 638fb6a4..7f14007e 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -1392,13 +1392,21 @@
     <path name="bluetooth-sco-headset-microphones" />
   </path>
 
-  <path name="usb-headset-microphones">
+  <path name="usb-microphones">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="usb-headset-microphones">
+    <path name="usb-microphones" />
+  </path>
+
+  <path name="usb-device-microphones">
+    <path name="usb-microphones" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index 649aed21..8eb240a7 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -81,8 +81,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -96,9 +96,11 @@
 
     <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
 
-    <latency source="microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index 638fb6a4..7f14007e 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -1392,13 +1392,21 @@
     <path name="bluetooth-sco-headset-microphones" />
   </path>
 
-  <path name="usb-headset-microphones">
+  <path name="usb-microphones">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="usb-headset-microphones">
+    <path name="usb-microphones" />
+  </path>
+
+  <path name="usb-device-microphones">
+    <path name="usb-microphones" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index 649aed21..8eb240a7 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -81,8 +81,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -96,9 +96,11 @@
 
     <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
 
-    <latency source="microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index 638fb6a4..7f14007e 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -1392,13 +1392,21 @@
     <path name="bluetooth-sco-headset-microphones" />
   </path>
 
-  <path name="usb-headset-microphones">
+  <path name="usb-microphones">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="usb-headset-microphones">
+    <path name="usb-microphones" />
+  </path>
+
+  <path name="usb-device-microphones">
+    <path name="usb-microphones" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index 2ef3673a..d33ed77c 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -71,10 +71,3 @@ on property:sys.boot_completed=1
     chown system input /dev/touch_offload
     chmod 660 /dev/touch_offload
     start twoshay
-
-# ETM
-on init && property:ro.build.flavor=caiman-userdebug
-    import /vendor/etc/init/hw/init.etm.rc
-
-on init && property:ro.build.flavor=caiman-eng
-    import /vendor/etc/init/hw/init.etm.rc
diff --git a/device-caiman.mk b/device-caiman.mk
index 83622352..c7946df2 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -392,3 +392,6 @@ endif
 # Enable Bluetooth AutoOn feature
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.server.automatic_turn_on=true
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/device-komodo.mk b/device-komodo.mk
index 3631a8be..70fe567e 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -388,3 +388,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable Bluetooth AutoOn feature
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.server.automatic_turn_on=true
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/device-tokay.mk b/device-tokay.mk
index 9b8e5bca..b283923f 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -358,3 +358,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable Bluetooth AutoOn feature
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.server.automatic_turn_on=true
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/powerstats/caiman/service.cpp b/powerstats/caiman/service.cpp
index 3ed20dd5..acf90cd3 100644
--- a/powerstats/caiman/service.cpp
+++ b/powerstats/caiman/service.cpp
@@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
 using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
-    // Add display residency stats
-    struct stat buffer;
-    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
-        // time_in_state exists
-        addDisplayMrr(p);
-    } else {
-        // time_in_state doesn't exist
-        std::vector<std::string> states = {
-            "Off",
-            "LP: 960x2142@1",
-            "LP: 960x2142@30",
-            "On: 960x2142@1",
-            "On: 960x2142@30",
-            "On: 960x2142@60",
-            "On: 960x2142@120",
-            "HBM: 960x2142@60",
-            "HBM: 960x2142@120",
-            "LP: 1280x2856@1",
-            "LP: 1280x2856@30",
-            "On: 1280x2856@1",
-            "On: 1280x2856@30",
-            "On: 1280x2856@60",
-            "On: 1280x2856@120",
-            "HBM: 1280x2856@60",
-            "HBM: 1280x2856@120"};
-
-        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
-                "Display",
-                "/sys/class/backlight/panel0-backlight/state",
-                states));
-    }
-
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
             p,
@@ -81,6 +49,7 @@ int main() {
 
     std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
 
+    addDisplayVrr(p, "Display");
     addZumaProCommonDataProviders(p);
     addDisplay(p);
 
diff --git a/powerstats/komodo/service.cpp b/powerstats/komodo/service.cpp
index 2d873333..acf90cd3 100644
--- a/powerstats/komodo/service.cpp
+++ b/powerstats/komodo/service.cpp
@@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
 using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
-    // Add display residency stats
-    struct stat buffer;
-    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
-        // time_in_state exists
-        addDisplayMrr(p);
-    } else {
-        // time_in_state doesn't exist
-        std::vector<std::string> states = {
-            "Off",
-            "LP: 1008x2244@1",
-            "LP: 1008x2244@30",
-            "On: 1008x2244@1",
-            "On: 1008x2244@30",
-            "On: 1008x2244@60",
-            "On: 1008x2244@120",
-            "HBM: 1008x2244@60",
-            "HBM: 1008x2244@120",
-            "LP: 1344x2992@1",
-            "LP: 1344x2992@30",
-            "On: 1344x2992@1",
-            "On: 1344x2992@30",
-            "On: 1344x2992@60",
-            "On: 1344x2992@120",
-            "HBM: 1344x2992@60",
-            "HBM: 1344x2992@120"};
-
-        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
-                "Display",
-                "/sys/class/backlight/panel0-backlight/state",
-                states));
-    }
-
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
             p,
@@ -81,6 +49,7 @@ int main() {
 
     std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
 
+    addDisplayVrr(p, "Display");
     addZumaProCommonDataProviders(p);
     addDisplay(p);