Merge "Fixing regression when going to fullscreen from PiP."