diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index 95886c8f3deb1..050d255bfd2d7 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -389,6 +389,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
         } else {
             ActivityOptions mainActivityOptions = ActivityOptions.fromBundle(mainOptions);
             mainActivityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter));
+            mainOptions = mainActivityOptions.toBundle();
         }
 
         sideOptions = sideOptions != null ? sideOptions : new Bundle();
diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
index 20499625337c7..05b74dd67fa6a 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -19,6 +19,7 @@ package com.android.server.wm;
 import static android.Manifest.permission.ACTIVITY_EMBEDDING;
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
+import static android.Manifest.permission.MANAGE_ACTIVITY_TASKS;
 import static android.Manifest.permission.START_ANY_ACTIVITY;
 import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED;
 import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
@@ -2494,7 +2495,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
                 activityType = activityOptions.getLaunchActivityType();
                 final int windowingMode = activityOptions.getLaunchWindowingMode();
                 if (activityOptions.freezeRecentTasksReordering()
-                        && mRecentTasks.isCallerRecents(callingUid)) {
+                        && mService.checkPermission(MANAGE_ACTIVITY_TASKS, callingPid, callingUid)
+                                == PERMISSION_GRANTED) {
                     mRecentTasks.setFreezeTaskListReordering();
                 }
                 if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY