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