diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
index 42b438041d7a2..20515e71a91ba 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
@@ -516,12 +516,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
                 // Skipping containers that do not have any activities to report.
                 continue;
             }
-            ActivityStack primaryContainer =
-                    new ActivityStack(
-                            container.getPrimaryContainer().collectActivities());
-            ActivityStack secondaryContainer =
-                    new ActivityStack(
-                            container.getSecondaryContainer().collectActivities());
+            ActivityStack primaryContainer = container.getPrimaryContainer().toActivityStack();
+            ActivityStack secondaryContainer = container.getSecondaryContainer().toActivityStack();
             SplitInfo splitState = new SplitInfo(primaryContainer,
                     secondaryContainer,
                     // Splits that are not showing side-by-side are reported as having 0 split
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java
index 54e44a70ed408..80d9c2c1719ce 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java
@@ -109,6 +109,10 @@ class TaskFragmentContainer {
         return allActivities;
     }
 
+    ActivityStack toActivityStack() {
+        return new ActivityStack(collectActivities(), mInfo.getRunningActivityCount() == 0);
+    }
+
     void addPendingAppearedActivity(@NonNull Activity pendingAppearedActivity) {
         mPendingAppearedActivities.add(pendingAppearedActivity);
     }
diff --git a/libs/WindowManager/Jetpack/window-extensions-release.aar b/libs/WindowManager/Jetpack/window-extensions-release.aar
index 4f36c9c690c9a..830d13dd6dc52 100644
Binary files a/libs/WindowManager/Jetpack/window-extensions-release.aar and b/libs/WindowManager/Jetpack/window-extensions-release.aar differ