diff --git a/build.gradle b/build.gradle
index f663ed2210..20b483bc76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -376,7 +376,6 @@ dependencies {
     implementation projects.viewcapturelib
     implementation projects.displaylib
     implementation projects.mechanics
-    implementation projects.mechanics.compose
 
     // Recents lib dependency
     withQuickstepCompileOnly projects.hiddenApi
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt
index cca117b0ca..51b50cd164 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt
@@ -101,7 +101,6 @@ fun SelectAppsForDrawerFolder(
             preferenceGroupItems(
                 count = 20,
                 isFirstChild = true,
-                        dividerStartIndent = 40.dp,
             ) {
                 AppItemPlaceholder()
             }
@@ -169,7 +168,6 @@ fun SelectAppsForDrawerFolder(
                     null
                 },
                 isFirstChild = selectedAppsInFolder.isEmpty(),
-                dividerStartIndent = 40.dp,
             ) { _, app ->
                 AppItem(
                     app = app,
diff --git a/modules/widgetpicker/src/com/android/launcher3/widgetpicker/ui/ViewModel.kt b/modules/widgetpicker/src/com/android/launcher3/widgetpicker/ui/ViewModel.kt
index 6a2f86ff84..bc06f8296e 100644
--- a/modules/widgetpicker/src/com/android/launcher3/widgetpicker/ui/ViewModel.kt
+++ b/modules/widgetpicker/src/com/android/launcher3/widgetpicker/ui/ViewModel.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.delay
  * An interface defining general structure of a view model in widget picker.
  */
 // TODO(b/419844646): Once stable, introduce a reusable library.
-internal interface ViewModel {
+interface ViewModel {
     /**
      * Implement this function to initialize the state of viewmodel by binding to the flows from the
      * interactors.
diff --git a/settings.gradle b/settings.gradle
index 9d67fdac82..9b381a87eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -72,9 +72,6 @@ project(':displaylib').projectDir = new File(rootDir, 'platform_frameworks_libs_
 include ':mechanics'
 project(':mechanics').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/mechanics')
 
-include ':mechanics:compose'
-project(':mechanics:compose').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/mechanics/compose')
-
 include ':hidden-api'
 
 include ':shared'
diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java
index 2a1f2db60a..1ea05e442b 100644
--- a/src/com/android/launcher3/model/BaseLauncherBinder.java
+++ b/src/com/android/launcher3/model/BaseLauncherBinder.java
@@ -95,7 +95,7 @@ public class BaseLauncherBinder {
             StringCache stringCache;
 
             synchronized (mBgDataModel) {
-                itemsIdMap = mBgDataModel.itemsIdMap.copy(mContext);
+                itemsIdMap = mBgDataModel.itemsIdMap.copy();
                 mBgDataModel.extraItems.forEach(extraItems::add);
                 if (incrementBindId) {
                     mBgDataModel.lastBindId++;