diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c74cfcdc29..03973b9ddc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-      - uses: gradle/gradle-build-action@v3-prerelease
+      - uses: gradle/actions/setup-gradle@v3
         with:
           dependency-graph: ${{ github.ref == 'refs/heads/release' && 'generate-and-submit' || 'disabled'}}
           gradle-home-cache-cleanup: true
@@ -62,7 +62,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-      - uses: gradle/gradle-build-action@v3-prerelease
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
       - run: ./gradlew spotlessCheck
diff --git a/build.gradle b/build.gradle
index 45ca5ff0db7..969f3e3013a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -406,7 +406,7 @@ spotless {
     kotlin {
         target("lawnchair/src/**/*.kt")
         ktlint().customRuleSets([
-            "io.nlopez.compose.rules:ktlint:0.3.10",
+            "io.nlopez.compose.rules:ktlint:0.3.11",
         ]).editorConfigOverride([
             "ktlint_compose_modifier-missing-check": "disabled",
             "ktlint_compose_compositionlocal-allowlist": "disabled",
diff --git a/lawnchair/res/values-af-rZA/strings.xml b/lawnchair/res/values-af-rZA/strings.xml
index 7e6c429dfcf..999c40ff398 100644
--- a/lawnchair/res/values-af-rZA/strings.xml
+++ b/lawnchair/res/values-af-rZA/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Statusbalk</string>
     <string name="show_status_bar">Wys Statusbalk</string>
     <string name="dark_status_bar_label">Donker Statusbalk</string>
diff --git a/lawnchair/res/values-am-rET/strings.xml b/lawnchair/res/values-am-rET/strings.xml
index 8b829afd73d..ef91e0049b0 100644
--- a/lawnchair/res/values-am-rET/strings.xml
+++ b/lawnchair/res/values-am-rET/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-ar-rSA/strings.xml b/lawnchair/res/values-ar-rSA/strings.xml
index 6705a0105e2..5baf91273c0 100644
--- a/lawnchair/res/values-ar-rSA/strings.xml
+++ b/lawnchair/res/values-ar-rSA/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">قائمة منبثقة</string>
     <string name="home_screen_lock_toggle_from_home_popup">عرض زر القُفل</string>
     <string name="show_system_settings_entry">إظهار إدخال إعدادات النظام</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">شريط الحالة</string>
     <string name="show_status_bar">إظهار شريط الحالة</string>
     <string name="dark_status_bar_label">شريط الحالة المظلم</string>
diff --git a/lawnchair/res/values-b+sr+Latn/strings.xml b/lawnchair/res/values-b+sr+Latn/strings.xml
index 152792bd7a7..595b59dba1b 100644
--- a/lawnchair/res/values-b+sr+Latn/strings.xml
+++ b/lawnchair/res/values-b+sr+Latn/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Iskačući meni</string>
     <string name="home_screen_lock_toggle_from_home_popup">Prikaži dugme za zaključavanje</string>
     <string name="show_system_settings_entry">Prikaži sistemsko podešavanje</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Statusna traka</string>
     <string name="show_status_bar">Prikaži statusnu traku</string>
     <string name="dark_status_bar_label">Tamna statusna traka</string>
diff --git a/lawnchair/res/values-bn-rBD/strings.xml b/lawnchair/res/values-bn-rBD/strings.xml
index 53e76349004..c9edaaf51fb 100644
--- a/lawnchair/res/values-bn-rBD/strings.xml
+++ b/lawnchair/res/values-bn-rBD/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">পপআপ মেনু</string>
     <string name="home_screen_lock_toggle_from_home_popup">লক করার বোতাম দেখান</string>
     <string name="show_system_settings_entry">সিস্টেম সেটিংস খোলার বোতাম দেখান</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">স্ট্যাটাস বার</string>
     <string name="show_status_bar">স্ট্যাটাস বার দেখান</string>
     <string name="dark_status_bar_label">কালো স্ট্যাটাস বার</string>
diff --git a/lawnchair/res/values-ca-rES/strings.xml b/lawnchair/res/values-ca-rES/strings.xml
index 69c6bf70aa3..074c495b120 100644
--- a/lawnchair/res/values-ca-rES/strings.xml
+++ b/lawnchair/res/values-ca-rES/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menú emergent</string>
     <string name="home_screen_lock_toggle_from_home_popup">Mostrar botó de bloqueig</string>
     <string name="show_system_settings_entry">Mostrar entrada de la configuració del sistema</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Mostrar Botó d\'Edició</string>
     <string name="status_bar_label">Barra de estat</string>
     <string name="show_status_bar">Mostrar la barra d\'estat</string>
     <string name="dark_status_bar_label">Barra d\'estat fosca</string>
diff --git a/lawnchair/res/values-cs-rCZ/strings.xml b/lawnchair/res/values-cs-rCZ/strings.xml
index a3c8709127f..fee478e1546 100644
--- a/lawnchair/res/values-cs-rCZ/strings.xml
+++ b/lawnchair/res/values-cs-rCZ/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Vyskakovací nabídka</string>
     <string name="home_screen_lock_toggle_from_home_popup">Zobrazit tlačítko uzamčení</string>
     <string name="show_system_settings_entry">Zobrazit položku nastavení systému</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Stavový řádek</string>
     <string name="show_status_bar">Zobrazit stavový řádek</string>
     <string name="dark_status_bar_label">Tmavý stavový řádek</string>
diff --git a/lawnchair/res/values-da-rDK/strings.xml b/lawnchair/res/values-da-rDK/strings.xml
index 866207ec5b2..d15c75bbd33 100644
--- a/lawnchair/res/values-da-rDK/strings.xml
+++ b/lawnchair/res/values-da-rDK/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Vis Statuslinje</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-de-rDE/strings.xml b/lawnchair/res/values-de-rDE/strings.xml
index a02f24813b1..21eac0b595e 100644
--- a/lawnchair/res/values-de-rDE/strings.xml
+++ b/lawnchair/res/values-de-rDE/strings.xml
@@ -188,6 +188,7 @@ workspace_increase_max_grid_size_label</string>
     <string name="popup_menu">Pop-up-Menü</string>
     <string name="home_screen_lock_toggle_from_home_popup">Sperrbutton anzeigen</string>
     <string name="show_system_settings_entry">Systemeinstellungen anzeigen</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Zeige Bearbeiten-Schaltfläche</string>
     <string name="status_bar_label">Statusleiste</string>
     <string name="show_status_bar">Suchleiste anzeigen</string>
     <string name="dark_status_bar_label">Dunkle Statusleiste</string>
diff --git a/lawnchair/res/values-el-rGR/strings.xml b/lawnchair/res/values-el-rGR/strings.xml
index df9e0198758..c23c46223eb 100644
--- a/lawnchair/res/values-el-rGR/strings.xml
+++ b/lawnchair/res/values-el-rGR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Αναδυόμενο Μενού</string>
     <string name="home_screen_lock_toggle_from_home_popup">Εμφάνιση Κουμπιού Κλειδώματος</string>
     <string name="show_system_settings_entry">Εμφάνιση Καταχώρησης Ρυθμίσεων Συστήματος</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Εμφάνιση Κουμπιού Επεξεργασίας</string>
     <string name="status_bar_label">Γραμμή Κατάστασης</string>
     <string name="show_status_bar">Εμφάνιση Γραμμής Κατάστασης</string>
     <string name="dark_status_bar_label">Σκοτεινή Γραμμή Κατάστασης</string>
diff --git a/lawnchair/res/values-en-rCA/strings.xml b/lawnchair/res/values-en-rCA/strings.xml
index 9ef85aa4997..0ad63f73c02 100644
--- a/lawnchair/res/values-en-rCA/strings.xml
+++ b/lawnchair/res/values-en-rCA/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-es-rES/strings.xml b/lawnchair/res/values-es-rES/strings.xml
index 2cd492cf9e9..d293d7ca2ee 100644
--- a/lawnchair/res/values-es-rES/strings.xml
+++ b/lawnchair/res/values-es-rES/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menú emergente</string>
     <string name="home_screen_lock_toggle_from_home_popup">Mostrar botón de bloqueo</string>
     <string name="show_system_settings_entry">Mostrar atajo a la configuración del sistema</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Barra de estado</string>
     <string name="show_status_bar">Mostrar Barra de estado</string>
     <string name="dark_status_bar_label">Barra de Estado Oscura</string>
diff --git a/lawnchair/res/values-fa-rIR/strings.xml b/lawnchair/res/values-fa-rIR/strings.xml
index 0ef9064ef53..83f72f77413 100644
--- a/lawnchair/res/values-fa-rIR/strings.xml
+++ b/lawnchair/res/values-fa-rIR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">منو Pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">نمایش دکمه قفل</string>
     <string name="show_system_settings_entry">نمایش ورودی تنظیمات سیستم</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">نوار وضعیت</string>
     <string name="show_status_bar">نشان‌دادن نوار وضعیت</string>
     <string name="dark_status_bar_label">نوار وضعیت تاریک</string>
diff --git a/lawnchair/res/values-fi-rFI/strings.xml b/lawnchair/res/values-fi-rFI/strings.xml
index ce38c50dfe6..04c90702834 100644
--- a/lawnchair/res/values-fi-rFI/strings.xml
+++ b/lawnchair/res/values-fi-rFI/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Ponnahdusikkuna</string>
     <string name="home_screen_lock_toggle_from_home_popup">Näytä lukituspainike</string>
     <string name="show_system_settings_entry">Näytä järjestelmäasetusten merkintä</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Tilapalkki</string>
     <string name="show_status_bar">Näytä tilapalkki</string>
     <string name="dark_status_bar_label">Tumma Tilapalkki</string>
diff --git a/lawnchair/res/values-fil-rPH/strings.xml b/lawnchair/res/values-fil-rPH/strings.xml
index c3031c10cd8..3611899df0a 100644
--- a/lawnchair/res/values-fil-rPH/strings.xml
+++ b/lawnchair/res/values-fil-rPH/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Ipakita ang Lock Button</string>
     <string name="show_system_settings_entry">I-show ang System Setting Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Ipakita ang Search Bar</string>
     <string name="dark_status_bar_label">Madilim na Status Bar</string>
diff --git a/lawnchair/res/values-fr-rFR/strings.xml b/lawnchair/res/values-fr-rFR/strings.xml
index 2a48ab76009..1987debee78 100644
--- a/lawnchair/res/values-fr-rFR/strings.xml
+++ b/lawnchair/res/values-fr-rFR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menu pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">Afficher le bouton de verrouillage</string>
     <string name="show_system_settings_entry">Afficher l\'entrée des paramètres du système</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Afficher le bouton Modifier</string>
     <string name="status_bar_label">Barre d\'état</string>
     <string name="show_status_bar">Afficher la barre d\'état</string>
     <string name="dark_status_bar_label">Barre d\'état sombre</string>
diff --git a/lawnchair/res/values-gl-rES/strings.xml b/lawnchair/res/values-gl-rES/strings.xml
index 106375b4854..bf2620c3abe 100644
--- a/lawnchair/res/values-gl-rES/strings.xml
+++ b/lawnchair/res/values-gl-rES/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-hi-rIN/strings.xml b/lawnchair/res/values-hi-rIN/strings.xml
index 7d6715fd5e8..4b319ca1af3 100644
--- a/lawnchair/res/values-hi-rIN/strings.xml
+++ b/lawnchair/res/values-hi-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">पॉपअप मेनू</string>
     <string name="home_screen_lock_toggle_from_home_popup">लॉक बटन दिखाएं</string>
     <string name="show_system_settings_entry">सिस्टम सेटिंग्स की प्रविष्टि दिखाएं</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">स्टेटस बार</string>
     <string name="show_status_bar">स्टेट्स बार दिखाएँ</string>
     <string name="dark_status_bar_label">गहरा स्टेट्स बार</string>
diff --git a/lawnchair/res/values-hu-rHU/strings.xml b/lawnchair/res/values-hu-rHU/strings.xml
index 40ff8589cfc..1441c671219 100644
--- a/lawnchair/res/values-hu-rHU/strings.xml
+++ b/lawnchair/res/values-hu-rHU/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Felugró menü</string>
     <string name="home_screen_lock_toggle_from_home_popup">Zárolási gomb megjelenítése</string>
     <string name="show_system_settings_entry">Rendszerbeállítások elem megjelenítése</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Állapotsor</string>
     <string name="show_status_bar">Állapotsor megjelenítése</string>
     <string name="dark_status_bar_label">Sötét állapotsor</string>
diff --git a/lawnchair/res/values-in-rID/strings.xml b/lawnchair/res/values-in-rID/strings.xml
index 99719d4cdc5..a794d7ede12 100644
--- a/lawnchair/res/values-in-rID/strings.xml
+++ b/lawnchair/res/values-in-rID/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menu Pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">Tampilkan Tombol Kunci</string>
     <string name="show_system_settings_entry">Tampilkan Entri Pengaturan Sistem</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Bar Status</string>
     <string name="show_status_bar">Tampilkan bar status</string>
     <string name="dark_status_bar_label">Tingkat Kegelapan Bar Status</string>
diff --git a/lawnchair/res/values-it-rIT/strings.xml b/lawnchair/res/values-it-rIT/strings.xml
index 25814540d44..50f57c22a85 100644
--- a/lawnchair/res/values-it-rIT/strings.xml
+++ b/lawnchair/res/values-it-rIT/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menu a comparsa</string>
     <string name="home_screen_lock_toggle_from_home_popup">Mostra pulsante di blocco</string>
     <string name="show_system_settings_entry">Mostra voce \"Impostazioni di sistema\"</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Barra di stato</string>
     <string name="show_status_bar">Mostra barra di stato</string>
     <string name="dark_status_bar_label">Barra di stato scura</string>
diff --git a/lawnchair/res/values-iw-rIL/strings.xml b/lawnchair/res/values-iw-rIL/strings.xml
index a93feca3343..3f74a50be31 100644
--- a/lawnchair/res/values-iw-rIL/strings.xml
+++ b/lawnchair/res/values-iw-rIL/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">תפריט Pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">הצג כפתור נעילה</string>
     <string name="show_system_settings_entry">הצג כניסה להגדרות המערכת</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">סרגל מצב</string>
     <string name="show_status_bar">הצגת שורת מצב</string>
     <string name="dark_status_bar_label">שורת מצב כהה</string>
diff --git a/lawnchair/res/values-ja-rJP/strings.xml b/lawnchair/res/values-ja-rJP/strings.xml
index 109f1f5ee60..6e172712217 100644
--- a/lawnchair/res/values-ja-rJP/strings.xml
+++ b/lawnchair/res/values-ja-rJP/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">ポップアップメニュー</string>
     <string name="home_screen_lock_toggle_from_home_popup">ロックボタンを表示</string>
     <string name="show_system_settings_entry">システム設定項目を表示</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">ステータスバー</string>
     <string name="show_status_bar">ステータスバーを表示</string>
     <string name="dark_status_bar_label">暗いステータスバー</string>
diff --git a/lawnchair/res/values-kmr-rTR/strings.xml b/lawnchair/res/values-kmr-rTR/strings.xml
index e311759a2d3..81bfbfad7f8 100644
--- a/lawnchair/res/values-kmr-rTR/strings.xml
+++ b/lawnchair/res/values-kmr-rTR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-ko-rKR/strings.xml b/lawnchair/res/values-ko-rKR/strings.xml
index 10c0aa921f0..e1f097bb83d 100644
--- a/lawnchair/res/values-ko-rKR/strings.xml
+++ b/lawnchair/res/values-ko-rKR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">팝업 메뉴</string>
     <string name="home_screen_lock_toggle_from_home_popup">잠금 버튼 표시</string>
     <string name="show_system_settings_entry">시스템 설정 항목 표시</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">상태표시줄</string>
     <string name="show_status_bar">상태 표시줄 표시</string>
     <string name="dark_status_bar_label">어두운 상태표시줄</string>
diff --git a/lawnchair/res/values-lt-rLT/strings.xml b/lawnchair/res/values-lt-rLT/strings.xml
index ed368698588..428644f8305 100644
--- a/lawnchair/res/values-lt-rLT/strings.xml
+++ b/lawnchair/res/values-lt-rLT/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menių</string>
     <string name="home_screen_lock_toggle_from_home_popup">Rodyti ūžrakto mygtuką</string>
     <string name="show_system_settings_entry">Rodyti Sistemos Nustatymų eilutę</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Būsenos Juosta</string>
     <string name="show_status_bar">Rodyti statuso juosta</string>
     <string name="dark_status_bar_label">Juoda statuso juosta</string>
diff --git a/lawnchair/res/values-ml-rIN/strings.xml b/lawnchair/res/values-ml-rIN/strings.xml
index 3b10e160170..4406f722b38 100644
--- a/lawnchair/res/values-ml-rIN/strings.xml
+++ b/lawnchair/res/values-ml-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">സ്റ്റാറ്റസ് ബാർ</string>
     <string name="show_status_bar">സ്റ്റാറ്റസ് ബാർ കാണിക്കുക</string>
     <string name="dark_status_bar_label">ഇരുണ്ട സ്റ്റാറ്റസ് ബാർ</string>
diff --git a/lawnchair/res/values-mr-rIN/strings.xml b/lawnchair/res/values-mr-rIN/strings.xml
index d1c51a6fbf1..0dca0d356c2 100644
--- a/lawnchair/res/values-mr-rIN/strings.xml
+++ b/lawnchair/res/values-mr-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">स्थिती गज दाखवा</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-nl-rNL/strings.xml b/lawnchair/res/values-nl-rNL/strings.xml
index a49584c0701..82a796be717 100644
--- a/lawnchair/res/values-nl-rNL/strings.xml
+++ b/lawnchair/res/values-nl-rNL/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Vergrendelingsknop Tonen</string>
     <string name="show_system_settings_entry">Toon Systeeminstellingeninvoer</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Statusbalk</string>
     <string name="show_status_bar">Statusbalk weergeven</string>
     <string name="dark_status_bar_label">Donkere Status Balk</string>
diff --git a/lawnchair/res/values-no-rNO/strings.xml b/lawnchair/res/values-no-rNO/strings.xml
index b566426dcfd..905838b1e11 100644
--- a/lawnchair/res/values-no-rNO/strings.xml
+++ b/lawnchair/res/values-no-rNO/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Statuslinje</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-pl-rPL/strings.xml b/lawnchair/res/values-pl-rPL/strings.xml
index 229a602aba3..565f881d674 100644
--- a/lawnchair/res/values-pl-rPL/strings.xml
+++ b/lawnchair/res/values-pl-rPL/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Wyskakujące menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Pokaż przycisk blokady</string>
     <string name="show_system_settings_entry">Pokaż Wpis Ustawień Systemu</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Pokaż przycisk Edytuj</string>
     <string name="status_bar_label">Pasek stanu</string>
     <string name="show_status_bar">Pokaż pasek stanu</string>
     <string name="dark_status_bar_label">Ciemny pasek statusu</string>
diff --git a/lawnchair/res/values-pt-rBR/strings.xml b/lawnchair/res/values-pt-rBR/strings.xml
index 9e97cba654b..9d5653d7de4 100644
--- a/lawnchair/res/values-pt-rBR/strings.xml
+++ b/lawnchair/res/values-pt-rBR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menu Flutuante</string>
     <string name="home_screen_lock_toggle_from_home_popup">Mostrar Botão de Bloqueio</string>
     <string name="show_system_settings_entry">Mostrar Entrada para Configurações do Sistema</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Barra de Status</string>
     <string name="show_status_bar">Mostrar barra de status</string>
     <string name="dark_status_bar_label">Barra de Status Escura</string>
diff --git a/lawnchair/res/values-pt-rPT/strings.xml b/lawnchair/res/values-pt-rPT/strings.xml
index 76d7b53fe32..1c3133d7f99 100644
--- a/lawnchair/res/values-pt-rPT/strings.xml
+++ b/lawnchair/res/values-pt-rPT/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menu Flutuante</string>
     <string name="home_screen_lock_toggle_from_home_popup">Mostrar Botão de Bloqueio</string>
     <string name="show_system_settings_entry">Mostrar Entrada de Definições de Sistema</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Mostrar Botão Editar</string>
     <string name="status_bar_label">Barra de Estado</string>
     <string name="show_status_bar">Mostrar Barra de Estado</string>
     <string name="dark_status_bar_label">Barra de Estado Escura</string>
diff --git a/lawnchair/res/values-ro-rRO/strings.xml b/lawnchair/res/values-ro-rRO/strings.xml
index e49fd1160e0..7aee1f32bb2 100644
--- a/lawnchair/res/values-ro-rRO/strings.xml
+++ b/lawnchair/res/values-ro-rRO/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Meniu Pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">Afișează butonul de blocare</string>
     <string name="show_system_settings_entry">Afișare intrarea setărilor de sistem</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Bară de stare</string>
     <string name="show_status_bar">Arată bara de stare</string>
     <string name="dark_status_bar_label">Bară de stare întunecată</string>
diff --git a/lawnchair/res/values-ru-rRU/strings.xml b/lawnchair/res/values-ru-rRU/strings.xml
index 45e76ebc791..00144e9c22a 100644
--- a/lawnchair/res/values-ru-rRU/strings.xml
+++ b/lawnchair/res/values-ru-rRU/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Всплывающее меню</string>
     <string name="home_screen_lock_toggle_from_home_popup">Показать кнопку блокировки</string>
     <string name="show_system_settings_entry">Показать запись системных настроек</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Строка состояния</string>
     <string name="show_status_bar">Отображать строку состояния</string>
     <string name="dark_status_bar_label">Темная строка состояния</string>
diff --git a/lawnchair/res/values-sk-rSK/strings.xml b/lawnchair/res/values-sk-rSK/strings.xml
index 132af40ff8f..57466c2b727 100644
--- a/lawnchair/res/values-sk-rSK/strings.xml
+++ b/lawnchair/res/values-sk-rSK/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Vyskakovacia ponuka</string>
     <string name="home_screen_lock_toggle_from_home_popup">Ukázať tlačidlo zamknutia</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Stavový riadok</string>
     <string name="show_status_bar">Zobraziť stavový riadok</string>
     <string name="dark_status_bar_label">Tmavý stavový riadok</string>
diff --git a/lawnchair/res/values-sl-rSI/strings.xml b/lawnchair/res/values-sl-rSI/strings.xml
index 1fbc096fb77..140e36b8fdd 100644
--- a/lawnchair/res/values-sl-rSI/strings.xml
+++ b/lawnchair/res/values-sl-rSI/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Statusna vrstica</string>
     <string name="show_status_bar">Pokaži statusno vrstico</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-sq-rAL/strings.xml b/lawnchair/res/values-sq-rAL/strings.xml
index 4c0e6b2cae6..aaefbd2b982 100644
--- a/lawnchair/res/values-sq-rAL/strings.xml
+++ b/lawnchair/res/values-sq-rAL/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Menuja e Pop-up</string>
     <string name="home_screen_lock_toggle_from_home_popup">Shfaq butonin kyçës</string>
     <string name="show_system_settings_entry">Shfaq hyrjen e opsioneve të sistemit</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Shiriti i Statusit</string>
     <string name="show_status_bar">Shfaq Shiritin e Statusit</string>
     <string name="dark_status_bar_label">Shiriti i Statusit i Zi</string>
diff --git a/lawnchair/res/values-sr/strings.xml b/lawnchair/res/values-sr/strings.xml
index aeea00d73a0..aaa48a60dea 100644
--- a/lawnchair/res/values-sr/strings.xml
+++ b/lawnchair/res/values-sr/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Искачући мени</string>
     <string name="home_screen_lock_toggle_from_home_popup">Прикажи дугме за закључавање</string>
     <string name="show_system_settings_entry">Прикажи системско подешавање</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Статусна трака</string>
     <string name="show_status_bar">Прикажи статусну траку</string>
     <string name="dark_status_bar_label">Тамна статусна трака</string>
diff --git a/lawnchair/res/values-sv-rSE/strings.xml b/lawnchair/res/values-sv-rSE/strings.xml
index d111a138841..43f7a38f14d 100644
--- a/lawnchair/res/values-sv-rSE/strings.xml
+++ b/lawnchair/res/values-sv-rSE/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Snabbmeny</string>
     <string name="home_screen_lock_toggle_from_home_popup">Visa låsknapp</string>
     <string name="show_system_settings_entry">Visa systeminställningar</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Visa redigeringsknapp</string>
     <string name="status_bar_label">Statusfält</string>
     <string name="show_status_bar">Visa statusfält</string>
     <string name="dark_status_bar_label">Mörkt statusfält</string>
diff --git a/lawnchair/res/values-sw-rKE/strings.xml b/lawnchair/res/values-sw-rKE/strings.xml
index b158d1da99f..264cafc08fd 100644
--- a/lawnchair/res/values-sw-rKE/strings.xml
+++ b/lawnchair/res/values-sw-rKE/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Upau wa Hali</string>
     <string name="show_status_bar">Onyesha Upau wa Hali</string>
     <string name="dark_status_bar_label">Upau wa Hali ya Giza</string>
diff --git a/lawnchair/res/values-ta-rIN/strings.xml b/lawnchair/res/values-ta-rIN/strings.xml
index 95a5cf17a69..c388dee03fd 100644
--- a/lawnchair/res/values-ta-rIN/strings.xml
+++ b/lawnchair/res/values-ta-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">நிலைப்பட்டி</string>
     <string name="show_status_bar">நிலைப்பலகையை காட்டு</string>
     <string name="dark_status_bar_label">இருண்ட நிலைப்பட்டி</string>
diff --git a/lawnchair/res/values-te-rIN/strings.xml b/lawnchair/res/values-te-rIN/strings.xml
index bf46575a63f..7297be01a17 100644
--- a/lawnchair/res/values-te-rIN/strings.xml
+++ b/lawnchair/res/values-te-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-th-rTH/strings.xml b/lawnchair/res/values-th-rTH/strings.xml
index ac33fff7ab6..1d3fc106446 100644
--- a/lawnchair/res/values-th-rTH/strings.xml
+++ b/lawnchair/res/values-th-rTH/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">เมนูป็อปอัพ</string>
     <string name="home_screen_lock_toggle_from_home_popup">แสดงปุ่มล็อค</string>
     <string name="show_system_settings_entry">แสดงรายการตั้งค่าระบบ</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">แถบสถานะ</string>
     <string name="show_status_bar">แสดงแถบสถานะ</string>
     <string name="dark_status_bar_label">แถบสถานะสีดำ</string>
diff --git a/lawnchair/res/values-tr-rTR/strings.xml b/lawnchair/res/values-tr-rTR/strings.xml
index a6685da6450..d143f2a5169 100644
--- a/lawnchair/res/values-tr-rTR/strings.xml
+++ b/lawnchair/res/values-tr-rTR/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Açılır menü</string>
     <string name="home_screen_lock_toggle_from_home_popup">Kilit tuşunu göster</string>
     <string name="show_system_settings_entry">Sistem ayarları girişini göster</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Durum Çubuğu</string>
     <string name="show_status_bar">Durum Çubuğunu Göster</string>
     <string name="dark_status_bar_label">Koyu Durum Çubuğu</string>
diff --git a/lawnchair/res/values-uk-rUA/strings.xml b/lawnchair/res/values-uk-rUA/strings.xml
index e2c86a7b023..4e7f5fd7a14 100644
--- a/lawnchair/res/values-uk-rUA/strings.xml
+++ b/lawnchair/res/values-uk-rUA/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Спливаюче меню</string>
     <string name="home_screen_lock_toggle_from_home_popup">Показувати кнопку блокування</string>
     <string name="show_system_settings_entry">Показувати запис про системні налаштування</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Рядок стану</string>
     <string name="show_status_bar">Показати рядок стану</string>
     <string name="dark_status_bar_label">Темний рядок стану</string>
diff --git a/lawnchair/res/values-ur-rIN/strings.xml b/lawnchair/res/values-ur-rIN/strings.xml
index 06bd9a36993..2f52564d105 100644
--- a/lawnchair/res/values-ur-rIN/strings.xml
+++ b/lawnchair/res/values-ur-rIN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-ur-rPK/strings.xml b/lawnchair/res/values-ur-rPK/strings.xml
index f7c8176167f..5ebb610d1c1 100644
--- a/lawnchair/res/values-ur-rPK/strings.xml
+++ b/lawnchair/res/values-ur-rPK/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">اسٹیٹس بار</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-uz-rUZ/strings.xml b/lawnchair/res/values-uz-rUZ/strings.xml
index 55c5dc10090..f37c4eed1e1 100644
--- a/lawnchair/res/values-uz-rUZ/strings.xml
+++ b/lawnchair/res/values-uz-rUZ/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
     <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">Show Status Bar</string>
     <string name="dark_status_bar_label">Dark Status Bar</string>
diff --git a/lawnchair/res/values-vi-rVN/strings.xml b/lawnchair/res/values-vi-rVN/strings.xml
index 826ab7443a6..4b89e3d24f0 100644
--- a/lawnchair/res/values-vi-rVN/strings.xml
+++ b/lawnchair/res/values-vi-rVN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Hiển thị phím khóa</string>
     <string name="show_system_settings_entry">Hiển thị mục cài đặt hệ thống</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Thanh trạng thái</string>
     <string name="show_status_bar">Hiện thanh trạng thái</string>
     <string name="dark_status_bar_label">Thanh trạng thái tối màu</string>
diff --git a/lawnchair/res/values-zh-rCN/strings.xml b/lawnchair/res/values-zh-rCN/strings.xml
index 94da6c9f3ba..2af73b2c0e0 100644
--- a/lawnchair/res/values-zh-rCN/strings.xml
+++ b/lawnchair/res/values-zh-rCN/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">弹出菜单</string>
     <string name="home_screen_lock_toggle_from_home_popup">显示锁定桌面按钮</string>
     <string name="show_system_settings_entry">显示系统设置项目</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">状态栏</string>
     <string name="show_status_bar">显示状态栏</string>
     <string name="dark_status_bar_label">深色状态栏</string>
diff --git a/lawnchair/res/values-zh-rTW/strings.xml b/lawnchair/res/values-zh-rTW/strings.xml
index 38b88dc9b31..46e26795263 100644
--- a/lawnchair/res/values-zh-rTW/strings.xml
+++ b/lawnchair/res/values-zh-rTW/strings.xml
@@ -186,6 +186,7 @@
     <string name="popup_menu">彈出式選單</string>
     <string name="home_screen_lock_toggle_from_home_popup">顯示鎖定桌面按鈕</string>
     <string name="show_system_settings_entry">顯示系統設定</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_status_bar">顯示狀態列</string>
     <string name="dark_status_bar_label">深色狀態列</string>
diff --git a/lawnchair/src/app/lawnchair/ui/StretchRecyclerViewContainer.kt b/lawnchair/src/app/lawnchair/ui/StretchRecyclerViewContainer.kt
index acbfcdbabce..44bfca94896 100644
--- a/lawnchair/src/app/lawnchair/ui/StretchRecyclerViewContainer.kt
+++ b/lawnchair/src/app/lawnchair/ui/StretchRecyclerViewContainer.kt
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.android.launcher3.Utilities
 import com.android.launcher3.workprofile.PersonalWorkPagedView
 
-class StretchRecyclerViewContainer @JvmOverloads constructor(
+open class StretchRecyclerViewContainer @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index b0557b4de39..21e12c7b739 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -525,9 +525,14 @@ public void createActivityInterface(long transitionLength) {
 
             // Since we are changing the start position of the UI, reapply the state, at the
             // end
-            controller.setEndAction(() -> mActivity.getStateManager().goToState(
-                    controller.getInterpolatedProgress() > 0.5 ? mTargetState : mBackgroundState,
-                    false));
+            controller.setEndAction(() -> {
+                if (mBackgroundState == mActivity.getStateManager().getState()) {
+                    mActivity.getStateManager().goToState(
+                            controller.getInterpolatedProgress() > 0.5 ? mTargetState
+                                    : mBackgroundState,
+                            false);
+                }
+            });
 
             RecentsView recentsView = mActivity.getOverviewPanel();
             AnimatorControllerWithResistance controllerWithResistance = AnimatorControllerWithResistance
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index a5ab28cbcbe..289801c1a08 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -647,6 +647,7 @@ public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonN
         boolean skipLauncherChanges = !launcherClosing;
 
         TaskView taskView = findTaskViewToLaunch(recentsView, v, appTargets);
+        if (taskView == null) return;
         PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
         createRecentsWindowAnimator(recentsView, taskView, skipLauncherChanges, appTargets,
                 wallpaperTargets, nonAppTargets, depthController, pa);
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index a6881d0a9b8..7298a839d0f 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -419,9 +419,7 @@ public void onBuildTargetParams(
             // conflict with layers that WM core positions (ie. the input consumers).  For shell
             // transitions, the animation leashes are reparented to an animation container so we
             // can bump layers as needed.
-            builder.setLayer(mDrawsBelowRecents
-                    ? Integer.MIN_VALUE + app.prefixOrderIndex
-                    : ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);
+            builder.setLayer(0);
         }
     }
 
diff --git a/settings.gradle b/settings.gradle
index c6049f0d581..553420d4e4f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 
 // https://docs.gradle.com/enterprise/gradle-plugin/
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.16.2"
 }
 
 gradleEnterprise {
diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index a36258499e2..3a709b1011f 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -100,6 +100,7 @@
 
 import app.lawnchair.allapps.LawnchairAlphabeticalAppsList;
 import app.lawnchair.font.FontManager;
+import app.lawnchair.ui.StretchRecyclerViewContainer;
 
 /**
  * All apps container view with search support for use in a dragging activity.
@@ -107,7 +108,7 @@
  * @param <T> Type of context inflating all apps.
  */
 public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
-        extends SpringRelativeLayout implements DragSource, Insettable,
+        extends StretchRecyclerViewContainer implements DragSource, Insettable,
         OnDeviceProfileChangeListener, PersonalWorkSlidingTabStrip.OnActivePageChangedListener,
         ScrimView.ScrimDrawingController {
 
diff --git a/src/com/android/launcher3/graphics/IconPalette.java b/src/com/android/launcher3/graphics/IconPalette.java
index 778b32a863c..bbad36d3e96 100644
--- a/src/com/android/launcher3/graphics/IconPalette.java
+++ b/src/com/android/launcher3/graphics/IconPalette.java
@@ -26,6 +26,8 @@
 import com.android.launcher3.R;
 import com.android.launcher3.util.Themes;
 
+import java.lang.IllegalArgumentException;
+
 /**
  * Contains colors based on the dominant color of an icon.
  */
@@ -107,7 +109,15 @@ private static String contrastChange(int colorOld, int colorNew, int bg) {
      * This was copied from com.android.internal.util.NotificationColorUtil.
      */
     private static int ensureTextContrast(int color, int bg) {
-        return findContrastColor(color, bg, 4.5);
+        int res = color;
+        try {
+            res = findContrastColor(color, bg, 4.5);
+        } catch (IllegalArgumentException e) {
+            // Just returning the same color in this case
+            Log.e(TAG, "ensureTextContrast: Invalid fg/bg color int."
+                    + " fg=" + color + " bg=" + bg);
+        }
+        return res;
     }
     /**
      * Finds a suitable color such that there's enough contrast.
diff --git a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
index fde220cbf69..b6fcdf41439 100644
--- a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
+++ b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
@@ -54,7 +54,7 @@ private void computeLocationRelativeToContainer(View child, Rect outRect) {
         outRect.left += child.getX();
         outRect.top += child.getY();
 
-        if (parent != mContainer) {
+        if (parent != null && parent != mContainer) {
             if (parent instanceof PagedView) {
                 PagedView page = (PagedView) parent;
                 outRect.left -= page.getScrollForPage(page.indexOfChild(child));
diff --git a/src/com/android/launcher3/widget/LauncherWidgetHolder.java b/src/com/android/launcher3/widget/LauncherWidgetHolder.java
index 5fec40fec67..125b9d71e87 100644
--- a/src/com/android/launcher3/widget/LauncherWidgetHolder.java
+++ b/src/com/android/launcher3/widget/LauncherWidgetHolder.java
@@ -19,6 +19,7 @@
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
+import android.app.ActivityOptions;
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
@@ -44,6 +45,7 @@
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.shared.TestProtocol;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ResourceBasedOverride;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
@@ -62,8 +64,7 @@ public class LauncherWidgetHolder {
     protected static final int FLAG_STATE_IS_NORMAL = 1 << 1;
     protected static final int FLAG_ACTIVITY_STARTED = 1 << 2;
     protected static final int FLAG_ACTIVITY_RESUMED = 1 << 3;
-    private static final int FLAGS_SHOULD_LISTEN =
-            FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED | FLAG_ACTIVITY_RESUMED;
+    private static final int FLAGS_SHOULD_LISTEN = FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED | FLAG_ACTIVITY_RESUMED;
 
     @NonNull
     private final Context mContext;
@@ -269,33 +270,45 @@ private void sendActionCancelled(final BaseActivity activity, final int requestC
                 () -> activity.onActivityResult(requestCode, RESULT_CANCELED, null));
     }
 
+    private Bundle getDefaultConfigurationActivityOptions() {
+        // Must allow background activity start for U.
+        return ActivityOptions.makeBasic()
+                .setPendingIntentBackgroundActivityStartMode(
+                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+                .toBundle();
+    }
+
     /**
-     * Returns an {@link android.app.ActivityOptions} bundle from the {code activity} for launching
-     * the configuration of the {@code widgetId} app widget, or null of options cannot be produced.
+     * Returns an {@link android.app.ActivityOptions} bundle from the {code
+     * activity} for launching
+     * the configuration of the {@code widgetId} app widget, or default
+     * configuration options
+     * if they cannot be produced.
      */
-    @Nullable
+    @NonNull
     protected Bundle getConfigurationActivityOptions(@NonNull BaseDraggingActivity activity,
             int widgetId) {
         LauncherAppWidgetHostView view = mViews.get(widgetId);
-        if (view == null) {
-            return activity.makeDefaultActivityOptions(
-                    -1 /* SPLASH_SCREEN_STYLE_UNDEFINED */).toBundle();
-        }
+        if (view == null)
+            return getDefaultConfigurationActivityOptions();
         Object tag = view.getTag();
-        if (!(tag instanceof ItemInfo)) {
-            return activity.makeDefaultActivityOptions(
-                    -1 /* SPLASH_SCREEN_STYLE_UNDEFINED */).toBundle();
-        }
-        Bundle bundle = activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();
+        if (!(tag instanceof ItemInfo))
+            return getDefaultConfigurationActivityOptions();
+        ActivityOptionsWrapper activityOptionsWrapper = activity.getActivityLaunchOptions(view, (ItemInfo) tag);
+        // Must allow background activity start for U.
+        activityOptionsWrapper.options.setPendingIntentBackgroundActivityStartMode(
+                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+        Bundle bundle = activityOptionsWrapper.toBundle();
         bundle.putInt(KEY_SPLASH_SCREEN_STYLE, SPLASH_SCREEN_STYLE_EMPTY);
         return bundle;
     }
 
     /**
      * Starts the binding flow for the widget
-     * @param activity The activity for which to bind the widget
+     * 
+     * @param activity    The activity for which to bind the widget
      * @param appWidgetId The ID of the widget
-     * @param info The {@link AppWidgetProviderInfo} of the widget
+     * @param info        The {@link AppWidgetProviderInfo} of the widget
      * @param requestCode The request code
      */
     public void startBindFlow(@NonNull BaseActivity activity,
@@ -354,9 +367,10 @@ public int[] getAppWidgetIds() {
 
     /**
      * Create a view for the specified app widget
-     * @param context The activity context for which the view is created
+     * 
+     * @param context     The activity context for which the view is created
      * @param appWidgetId The ID of the widget
-     * @param appWidget The {@link LauncherAppWidgetProviderInfo} of the widget
+     * @param appWidget   The {@link LauncherAppWidgetProviderInfo} of the widget
      * @return A view for the widget
      */
     @NonNull
@@ -368,11 +382,13 @@ public AppWidgetHostView createView(@NonNull Context context, int appWidgetId,
             CustomWidgetManager.INSTANCE.get(context).onViewCreated(lahv);
             return lahv;
         } else if ((mFlags & FLAG_LISTENING) == 0) {
-            // Since the launcher hasn't started listening to widget updates, we can't simply call
+            // Since the launcher hasn't started listening to widget updates, we can't
+            // simply call
             // super.createView here because the later will make a binder call to retrieve
             // RemoteViews from system process.
-            // TODO: have launcher always listens to widget updates in background so that this
-            //  check can be removed altogether.
+            // TODO: have launcher always listens to widget updates in background so that
+            // this
+            // check can be removed altogether.
             if (FeatureFlags.ENABLE_CACHED_WIDGET.get()) {
                 final RemoteViews cachedRemoteViews = getCachedRemoteViews(appWidgetId);
                 if (cachedRemoteViews != null) {
@@ -386,7 +402,8 @@ public AppWidgetHostView createView(@NonNull Context context, int appWidgetId,
                     return view;
                 }
             }
-            // If cache misses or not enabled, a placeholder for the widget will be returned.
+            // If cache misses or not enabled, a placeholder for the widget will be
+            // returned.
             DeferredAppWidgetHostView view = new DeferredAppWidgetHostView(context);
             view.setAppWidget(appWidgetId, appWidget);
             mViews.put(appWidgetId, view);
@@ -399,7 +416,8 @@ public AppWidgetHostView createView(@NonNull Context context, int appWidgetId,
                     throw new RuntimeException(e);
                 }
 
-                // If the exception was thrown while fetching the remote views, let the view stay.
+                // If the exception was thrown while fetching the remote views, let the view
+                // stay.
                 // This will ensure that if the widget posts a valid update later, the view
                 // will update.
                 LauncherAppWidgetHostView view = mViews.get(appWidgetId);
@@ -425,9 +443,10 @@ public interface ProviderChangedListener {
 
     /**
      * Called to return a proper view when creating a view
-     * @param context The context for which the widget view is created
+     * 
+     * @param context     The context for which the widget view is created
      * @param appWidgetId The ID of the added widget
-     * @param appWidget The provider info of the added widget
+     * @param appWidget   The provider info of the added widget
      * @return A view for the specified app widget
      */
     @NonNull
@@ -438,12 +457,14 @@ public LauncherAppWidgetHostView onCreateView(Context context, int appWidgetId,
             view = getPendingView(appWidgetId);
             removePendingView(appWidgetId);
         } else if (mDeferredViews.get(appWidgetId) != null) {
-            // In case the widget view is deferred, we will simply return the deferred view as
-            // opposed to instantiate a new instance of LauncherAppWidgetHostView since launcher
+            // In case the widget view is deferred, we will simply return the deferred view
+            // as
+            // opposed to instantiate a new instance of LauncherAppWidgetHostView since
+            // launcher
             // already added the former to the workspace.
             view = mDeferredViews.get(appWidgetId);
         } else {
-            view = new LawnchairAppWidgetHostView (context);
+            view = new LawnchairAppWidgetHostView(context);
         }
         mViews.put(appWidgetId, view);
         return view;
@@ -470,7 +491,8 @@ public boolean isListening() {
     }
 
     /**
-     * Sets or unsets a flag the can change whether the widget host should be in the listening
+     * Sets or unsets a flag the can change whether the widget host should be in the
+     * listening
      * state.
      */
     private void setShouldListenFlag(int flag, boolean on) {