diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 23eb1f25241..41b7ec6ebed 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -152,7 +152,8 @@
         <Preference
             android:key="demo_mode"
             android:title="@string/demo_mode">
-            <intent android:action="com.android.settings.action.DEMO_MODE" />
+            <intent android:action="com.android.settings.action.DEMO_MODE"
+                    android:targetPackage="com.android.systemui"/>
         </Preference>
 
         <Preference
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
index e75ab1a53c4..b107501e9c1 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
@@ -195,7 +195,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverController
 
     @VisibleForTesting
     void rebootDevice(Context context) {
-        final Intent intent = new Intent(Intent.ACTION_REBOOT);
+        final Intent intent = new Intent(Intent.ACTION_REBOOT).setPackage("android");
         context.startActivity(intent);
     }
 
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index c38be949760..26c48ae0614 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -173,7 +173,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
 
         if (KEY_SYSTEM_NAV_GESTURAL.equals(info.getKey())) {
             pref.setExtraWidgetOnClickListener((v) -> startActivity(new Intent(
-                    GestureNavigationSettingsFragment.GESTURE_NAVIGATION_SETTINGS)));
+                    GestureNavigationSettingsFragment.GESTURE_NAVIGATION_SETTINGS)
+                    .setPackage(getContext().getPackageName())));
         }
 
         if (KEY_SYSTEM_NAV_2BUTTONS.equals(info.getKey()) || KEY_SYSTEM_NAV_3BUTTONS.equals(