diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 1eff8f0..81ef6a9 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -61,7 +61,6 @@
     BlissUpdater \
     BlissPapers \
     SettingsIntelligenceGooglePrebuilt \
-    Lawnchair \
     Longshot \
     OPScreenRecorder \
     NexusWallpapersStubPrebuilt2019Static \
@@ -75,6 +74,18 @@
     WeatherIcons \
     OmniStyle
 
+ifeq ($(TARGET_USES_LAWNCHAIR),true)
+PRODUCT_PACKAGES += \
+    Lawnchair
+
+PRODUCT_COPY_FILES += \
+    vendor/bliss/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lawnchair.xml \
+    vendor/bliss/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
+else
+PRODUCT_PACKAGES += \
+    TrebuchetQuickStep
+endif
+
 # Accents
 PRODUCT_PACKAGES += \
     AccentColorYellowOverlay \
@@ -105,9 +116,3 @@
 # Hidden api whitelisted apps
 PRODUCT_COPY_FILES += \
     vendor/bliss/prebuilt/common/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml
-
-# Lawnchair
-PRODUCT_COPY_FILES += \
-    vendor/bliss/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lawnchair.xml \
-    vendor/bliss/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
-
diff --git a/config/permissions/privapp-permissions-lineage-product.xml b/config/permissions/privapp-permissions-lineage-product.xml
index 1ce093e..b14cf08 100644
--- a/config/permissions/privapp-permissions-lineage-product.xml
+++ b/config/permissions/privapp-permissions-lineage-product.xml
@@ -25,6 +25,13 @@
         <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.android.launcher3">
+        <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+    </privapp-permissions>
+
     <privapp-permissions package="com.google.android.apps.nexuslauncher">
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 162035a..b080546 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -112,12 +112,6 @@
     <!-- Sharesheet: define a max number of targets per application for new shortcuts-based direct share introduced in Q -->
     <integer name="config_maxShortcutTargetsPerApp">8</integer>
 
-    <!-- Component name for the activity that will be presenting the Recents UI, which will receive special permissions for API related
-          to fetching and presenting recent tasks. The default configuration uses Launcehr3QuickStep as default launcher and points to
-          the corresponding recents component. When using a different default launcher, change this appropriately or use the default
-          systemui implementation: com.android.systemui/.recents.RecentsActivity -->
-    <string name="config_recentsComponentName" translatable="false">ch.deletescape.lawnchair.ci/com.android.quickstep.RecentsActivity</string>
-
     <!-- Colon separated list of package names that should be granted DND access -->
     <string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
 
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 9149c61..e7dd22e 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -130,6 +130,7 @@
 LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_USES_LAWNCHAIR),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := Lawnchair
 LOCAL_SRC_FILES := priv-app/$(LOCAL_MODULE).apk
@@ -141,6 +142,7 @@
 LOCAL_DEX_PREOPT := false
 LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
 include $(BUILD_PREBUILT)
+endif
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Longshot
diff --git a/prebuilt/common/app/BlissStatistics.apk b/prebuilt/common/app/BlissStatistics.apk
index 2023f99..856bf24 100644
--- a/prebuilt/common/app/BlissStatistics.apk
+++ b/prebuilt/common/app/BlissStatistics.apk
Binary files differ
diff --git a/tools/changelog b/tools/changelog
index d6f2612..f70b0e0 100755
--- a/tools/changelog
+++ b/tools/changelog
@@ -28,7 +28,8 @@
 	echo >> $Changelog;
 
 	# Cycle through every repo to find commits between 2 dates
-	repo forall -pc 'git log --oneline --after=$After_Date --until=$Until_Date' >> $Changelog
+        CURRENT_PATH="$(realpath `pwd`)"
+        repo forall -c "GIT_LOG=\`git log --oneline --after=$After_Date --until=$Until_Date\` ; if [ ! -z \"\$GIT_LOG\" ]; then printf '\n * '; realpath \`pwd\` | sed 's|^$CURRENT_PATH/||' ; echo \"\$GIT_LOG\"; fi" >> $Changelog
 	echo >> $Changelog;
 done