Merge "Disable swipe-to-reveal nav bar / status bar during setup"