Merge "Bouncer should not show over the full screen user switcher on boot." into pi-dev