Merge "Fixing when the full-screen switcher appears." into pi-dev