Merge "Fix so that status bar doesn't resize when hiding nav bar."