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

Change-Id: If433030b4fdd9885fc67ee3025fc30fd60eb3880