Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev am: ef4e38f96f
am: 407e77c299

Change-Id: I5efc89253b286f49e82767063a41ca54698b4bf8