Merge "Fixing when the full-screen switcher appears." into pi-dev
am: 4c5341c4b9

Change-Id: I44a54096ac3a6c119a33e292a14eccc72760c797