Merge "Reduce flickering when exiting PiP to fullscreen" into udc-dev