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

Change-Id: I12ef53895e7da75f416556af933e72e5abf1f02a