Merge "Delay PiP transition to fullscreen until activities draw." into oc-dev