Merge changes I7d2ca2a2,I9f1fc593 into rvc-dev

* changes:
  Fix a couple issues with previous CL (keeping tasks hidden)
  Keep task hidden until task appeared

core/java/android/window/TaskOrganizerTaskEmbedder.java

@@ -254,7 +254,9 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
             mTaskToken = taskInfo.token;
             mTaskLeash = mTaskToken.getLeash();
             mTransaction.reparent(mTaskLeash, mSurfaceControl)
-                    .show(mSurfaceControl).apply();
+                    .show(mTaskLeash)
+                    .show(mSurfaceControl)
+                    .apply();
             if (mPendingNotifyBoundsChanged) {
                 // TODO: Either defer show or hide and synchronize show with the resize
                 notifyBoundsChanged();