diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ba7c0f60..86d1c906b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,29 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!--
-    ** Special Requirements **
-
-    This AndroidManifest.xml will be copied into the stub
-    APK to allow APK delegation. This is why these special
-    requirements exist.
-
-    * Class names *
-    Class names a.a, a.c, a.e should not be changed as they are used
-    externally. All other class names can be changed.
-
-    * Resource IDs *
-    All resource IDs referred in AndroidManifest.xml is required to be
-    included into the "shared" module to make the ID match with stub.
-
--->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
@@ -36,7 +18,6 @@
         tools:replace="android:appComponentFactory">
 
         <!-- Splash -->
-
         <activity
             android:name="a.c"
             android:configChanges="orientation|screenSize"
@@ -48,21 +29,18 @@
         </activity>
 
         <!-- Main -->
-
         <activity
             android:name="a.b"
             android:configChanges="orientation|screenSize"
             android:exported="true" />
 
         <!-- Flashing  -->
-
         <activity
             android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor" />
 
         <!-- Superuser -->
-
         <activity
             android:name="a.m"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
@@ -71,13 +49,11 @@
             android:exported="false" />
 
         <!-- Receiver -->
-
         <receiver
             android:name="a.h"
             android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.REBOOT" />
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
             <intent-filter>
@@ -89,7 +65,6 @@
         </receiver>
 
         <!-- DownloadService -->
-
         <service
             android:name="a.j"
             android:exported="false" />
@@ -105,6 +80,12 @@
             android:authorities="${applicationId}.workmanager-init"
             tools:node="remove" />
 
+        <!-- We don't invalidate Room -->
+        <service
+            android:name="androidx.room.MultiInstanceInvalidationService"
+            android:exported="false"
+            tools:node="remove"/>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/topjohnwu/magisk/Const.kt b/app/src/main/java/com/topjohnwu/magisk/Const.kt
index 79738f20f..beb603d8a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/Const.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/Const.kt
@@ -24,7 +24,7 @@ object Const {
 
     object Version {
         const val MIN_SUPPORT = 18000
-        const val CONNECT_MODE = 20002
+        const val CONNECT_MODE = 20100
     }
 
     object ID {
diff --git a/app/src/main/java/com/topjohnwu/magisk/Info.kt b/app/src/main/java/com/topjohnwu/magisk/Info.kt
index 2eec3295a..7b4820c25 100644
--- a/app/src/main/java/com/topjohnwu/magisk/Info.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/Info.kt
@@ -37,13 +37,8 @@ object Info {
         val code = ShellUtils.fastCmd("magisk -V").toInt()
         val hide = Shell.su("magiskhide --status").exec().isSuccess
         var mode = -1
-        if (code >= Const.Version.CONNECT_MODE) {
+        if (code >= Const.Version.CONNECT_MODE)
             mode = Shell.su("magisk --connect-mode").exec().code
-            if (mode == 0) {
-                // Manually trigger broadcast test
-                Shell.su("magisk --broadcast-test").exec()
-            }
-        }
         Env(code, str, hide, mode)
     }.getOrElse { Env() }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
index f31fa40f1..4c72c992c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
@@ -51,23 +51,14 @@ open class GeneralReceiver : BaseReceiver() {
         }
 
         when (intent.action ?: return) {
-            Intent.ACTION_REBOOT, Intent.ACTION_BOOT_COMPLETED -> {
-                val action = intent.getStringExtra("action")
-                if (action == null) {
-                    // Actual boot completed event
-                    Shell.su("mm_patch_dtbo").submit {
-                        if (it.isSuccess)
-                            Notifications.dtboPatched(context)
-                    }
-                    return
-                }
-                when (action) {
+            Intent.ACTION_REBOOT -> {
+                when (val action = intent.getStringExtra("action") ?: return) {
                     REQUEST -> {
                         val i = context.intent<SuRequestActivity>()
-                                .setAction(action)
-                                .putExtra("socket", intent.getStringExtra("socket"))
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+                            .setAction(action)
+                            .putExtra("socket", intent.getStringExtra("socket"))
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
                         if (SDK_INT >= 29) {
                             // Android Q does not allow starting activity from background
                             i.startActivityWithRoot()
@@ -92,7 +83,7 @@ open class GeneralReceiver : BaseReceiver() {
             Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
                 val pkg = getPkg(intent)
                 policyDB.delete(pkg).blockingGet()
-                "magiskhide --rm $pkg".su().blockingGet()
+                Shell.su("magiskhide --rm $pkg").submit()
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setup(context)
             Const.Key.BROADCAST_MANAGER_UPDATE -> {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
index c2c710374..845cb2efb 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
@@ -60,6 +60,11 @@ open class SplashActivity : Activity() {
         // Setup shortcuts
         Shortcuts.setup(this)
 
+        Shell.su("mm_patch_dtbo").submit {
+            if (it.isSuccess)
+                Notifications.dtboPatched(this)
+        }
+
         DONE = true
 
         startActivity(intent<MainActivity>().apply { intent?.also { putExtras(it) } })
diff --git a/scripts/emulator.sh b/scripts/emulator.sh
index ceb3e8388..a01e0f040 100755
--- a/scripts/emulator.sh
+++ b/scripts/emulator.sh
@@ -118,3 +118,4 @@ mkdir -p /data/adb/modules 2>/dev/null
 mkdir /data/adb/post-fs-data.d 2>/dev/null
 mkdir /data/adb/services.d 2>/dev/null
 /sbin/magisk --daemon
+/sbin/magisk --broadcast-test
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 6d3dcb4bd..109e8d1b7 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!--
-    Try to recreate the main app's AndroidManifest.xml
--->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:name="a.e"
@@ -58,7 +52,6 @@
             android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.REBOOT" />
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
             <intent-filter>