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

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