Merge "Use correct task bounds after updating override config" into nyc-dev

services/core/java/com/android/server/am/ActivityStackSupervisor.java

@@ -1798,7 +1798,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
                     // WM resizeTask must be done after the task is moved to the correct stack,
                     // because Task's setBounds() also updates dim layer's bounds, but that has
                     // dependency on the stack.
-                    mWindowManager.resizeTask(task.taskId, bounds, task.mOverrideConfig,
+                    mWindowManager.resizeTask(task.taskId, task.mBounds, task.mOverrideConfig,
                             false /* relayout */, false /* forced */);
                 }
             }

services/core/java/com/android/server/am/TaskRecord.java

@@ -1518,6 +1518,9 @@ final class TaskRecord {
     Rect updateOverrideConfigurationFromLaunchBounds() {
         final Rect bounds = validateBounds(getLaunchBounds());
         updateOverrideConfiguration(bounds);
+        if (bounds != null) {
+            bounds.set(mBounds);
+        }
         return bounds;
     }