diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3c06488e73c3f..b332739820dc5 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2674,8 +2674,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                         .setWindowingMode(rootTask.getWindowingMode())
                         .setActivityType(rootTask.getActivityType())
                         .setActivityInfo(ainfo)
-                        .setParent(rootTask.getDisplayArea())
                         .setIntent(intent)
+                        .setTaskId(rootTask.getDisplayArea().getNextRootTaskId())
                         .build();
 
                 if (!mRecentTasks.addToBottom(task)) {
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index cc982308e658b..1e492df24a62e 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -7181,6 +7181,7 @@ class Task extends WindowContainer<WindowContainer> {
                     + " mode=" + windowingModeToString(getWindowingMode()));
             pw.println("  isSleeping=" + shouldSleepActivities());
             pw.println("  mBounds=" + getRequestedOverrideBounds());
+            pw.println("  mCreatedByOrganizer=" + mCreatedByOrganizer);
         };
 
         boolean printed = false;