Merge "PIP: Fix transition to and from PiP when letterboxed" into pi-dev