diff --git a/device-akita.mk b/device-akita.mk
index c52d0c5..83937b6 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -396,3 +396,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+# 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