diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
index 1e4c8e4dc2685..e21861ab426ee 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
@@ -1091,6 +1091,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
             t.setPosition(mTiles.mHomeAndRecentsSurfaces.get(i),
                     mTiles.mHomeBounds.left - otherTaskRect.left,
                     mTiles.mHomeBounds.top - otherTaskRect.top);
+            t.setWindowCrop(mTiles.mHomeAndRecentsSurfaces.get(i), null);
         }
         final SurfaceControl dividerCtrl = getWindowSurfaceControl();
         if (dividerCtrl != null) {
diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 7eccf085f2f76..6ef5ed62f6298 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -241,9 +241,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                                 + " multi-window mode... newParent=" + newParent + " task=" + task);
                         return 0;
                     } else {
-                        // Clear the window crop on root task since it may not be updated after
-                        // reparent (no longer be a root task)
-                        task.getSurfaceControl().setWindowCrop(null);
                         task.reparent((ActivityStack) newParent,
                                 hop.getToTop() ? POSITION_TOP : POSITION_BOTTOM,
                                 false /*moveParents*/, "sanitizeAndApplyHierarchyOp");