diff --git a/SystemUIShared/build.gradle b/SystemUIShared/build.gradle
index b99e5b9b6b..77f5ec7faa 100644
--- a/SystemUIShared/build.gradle
+++ b/SystemUIShared/build.gradle
@@ -42,5 +42,6 @@ android {
 }
 
 dependencies {
+    compileOnly fileTree(dir: new File(rootProject.projectDir, 'prebuilts/libs'), include: 'wm_shell-aidls.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/SystemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java b/SystemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java
index 442716878a..32469b841f 100644
--- a/SystemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java
+++ b/SystemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java
@@ -16,7 +16,6 @@
 
 package com.android.systemui.shared.system;
 
-import android.annotation.IntDef;
 import android.os.Build;
 import android.view.View;
 
@@ -47,14 +46,6 @@ public final class InteractionJankMonitorWrapper {
     public static final int CUJ_APP_LAUNCH_FROM_WIDGET =
             InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET;
 
-    @IntDef({
-            CUJ_APP_LAUNCH_FROM_RECENTS,
-            CUJ_APP_LAUNCH_FROM_ICON,
-            CUJ_APP_CLOSE_TO_HOME,
-            CUJ_APP_CLOSE_TO_PIP,
-            CUJ_QUICK_SWITCH,
-            CUJ_APP_LAUNCH_FROM_WIDGET,
-    })
     @Retention(RetentionPolicy.SOURCE)
     public @interface CujType {
     }
diff --git a/build.gradle b/build.gradle
index 773bd25702..0fb169ec7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,7 +172,7 @@ android {
             java.srcDirs = ['src', 'src_plugins']
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
-                srcDirs = ['protos/', 'protos_overrides/', 'quickstep/proto_overrides/']
+                srcDirs = ['protos/', 'quickstep/protos_overrides/']
             }
         }
 
@@ -263,6 +263,7 @@ dependencies {
 
     // Recents lib dependency
     withQuickstepImplementation project(':SystemUIShared')
+    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'wm_shell-aidls.jar')
 
     // Required for AOSP to compile. This is already included in the sysui_shared.jar
     withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')
diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
index 39dcb39f7b..ce3196fa57 100644
--- a/lawnchair/AndroidManifest.xml
+++ b/lawnchair/AndroidManifest.xml
@@ -17,6 +17,8 @@
 */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+
     <application>
         <meta-data
             android:name="preloaded_fonts"
@@ -54,5 +56,13 @@
                 <action android:name="android.accessibilityservice.AccessibilityService" />
             </intent-filter>
         </service>
+
+        <meta-data
+            android:name="xyz.paphonb.quickstepswitcher.minSdk"
+            android:value="31" />
+
+        <meta-data
+            android:name="xyz.paphonb.quickstepswitcher.maxSdk"
+            android:value="31" />
     </application>
 </manifest>
diff --git a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
index e98f505139..0b2dc3646c 100644
--- a/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
+++ b/lawnchair/src/app/lawnchair/allapps/LawnchairAlphabeticalAppsList.kt
@@ -9,7 +9,7 @@ import com.android.launcher3.allapps.WorkAdapterProvider
 import com.android.launcher3.model.data.AppInfo
 import com.android.launcher3.util.ItemInfoMatcher
 
-class LawnchairAlphabeticalAppsList(context: Context, appsStore: AllAppsStore, adapterProvider: WorkAdapterProvider) :
+class LawnchairAlphabeticalAppsList(context: Context, appsStore: AllAppsStore, adapterProvider: WorkAdapterProvider?) :
     AlphabeticalAppsList(context, appsStore, adapterProvider) {
 
     private val hiddenApps = PreferenceManager.getInstance(context).hiddenAppSet
diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui
index 600067fce6..1bce2a5fb9 160000
--- a/platform_frameworks_libs_systemui
+++ b/platform_frameworks_libs_systemui
@@ -1 +1 @@
-Subproject commit 600067fce6e66d2d35db1ba11c7081da68b52c82
+Subproject commit 1bce2a5fb9f8977aa8f6519f3805bc1a92c1406b
diff --git a/prebuilts/libs/wm_shell-aidls.jar b/prebuilts/libs/wm_shell-aidls.jar
new file mode 100644
index 0000000000..465b5f3056
Binary files /dev/null and b/prebuilts/libs/wm_shell-aidls.jar differ
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index c6072cd7a9..9b9f46f5cf 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -630,6 +630,8 @@ public class DeviceProfile {
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
             autoResizeAllAppsCells();
         } else {
+            allAppsIconSizePx = iconSizePx;
+            allAppsIconTextSizePx = iconTextSizePx;
             allAppsIconDrawablePaddingPx = iconDrawablePaddingPx;
             allAppsCellHeightPx = getCellSize().y;
         }
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 36b5afab91..301eb45eca 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -474,7 +474,7 @@ public class LauncherPreviewRenderer extends ContextWrapper
         }
 
         // Add first page QSB
-        if (FeatureFlags.QSB_ON_FIRST_SCREEN) {
+        if (FeatureFlags.topQsbOnFirstScreenEnabled(mContext)) {
             View qsb = mHomeElementInflater.inflate(
                     R.layout.search_container_workspace, mWorkspace, false);
             CellLayout.LayoutParams lp =