diff --git a/device-oriole.mk b/device-oriole.mk
index e7d8fd7..f01655c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -271,3 +271,11 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
+
diff --git a/device-raven.mk b/device-raven.mk
index fffcbfc..a926be3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -290,3 +290,11 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
+