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

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