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

* commit 'b64150e7c0f2a7a1d7def675be407481380567d3':
  Fix nav bar glitch when quickly turning screen off then on.