Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev