Merge "PIP: Fix move to full screen" into nyc-dev