am b64150e7: am 780a13b0: Merge "Fix nav bar glitch when quickly turning...
am b64150e7: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
* commit 'b64150e7':
Fix nav bar glitch when quickly turning screen off then on.