diff --git a/Android.bp b/Android.bp
index 24fc7e8f42c..91710126142 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,6 +74,7 @@ android_library {
         "android.hardware.dumpstate-V1.1-java",
         "lottie",
         "WifiTrackerLib",
+        "windowExtLib",
     ],
 
     libs: [
@@ -102,6 +103,10 @@ android_app {
     ],
     static_libs: ["Settings-core"],
     uses_libs: ["org.apache.http.legacy"],
+    optional_uses_libs: [
+        "androidx.window.extensions",
+        "androidx.window.sidecar",
+    ],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -113,6 +118,11 @@ android_library_import {
     aars: ["libs/contextualcards.aar"],
 }
 
+android_library_import {
+    name: "windowExtLib",
+    aars: ["libs/window_ext_lib.aar"],
+}
+
 filegroup {
     name: "Settings_proguard_flags",
     srcs: ["proguard.flags"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 426aebff81a..8fb49cb6db4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -122,6 +122,7 @@
             android:appComponentFactory="androidx.core.app.CoreComponentFactory">
 
         <uses-library android:name="org.apache.http.legacy" />
+
         <!-- Settings -->
 
         <activity android:name=".homepage.SettingsHomepageActivity"
diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar
new file mode 100644
index 00000000000..b1a95113d2d
Binary files /dev/null and b/libs/window_ext_lib.aar differ
diff --git a/proguard.flags b/proguard.flags
index b66a7862df2..5482f1c52d0 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -66,3 +66,8 @@
 -keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker {
     public <init>(android.content.Context, android.net.Uri);
 }
+
+# Keep WM Jetpack classes and callbacks
+-keep class androidx.window.extensions.** { *; }
+-dontwarn androidx.window.extensions.**
+-keep class androidx.window.** { *; }