am ba51978e: am 8385adc9: Merge "NavBar: Slippery on the unsecured lock screen." into jb-dev

* commit 'ba51978e9e7e20126dc74efa7ce631ad6780838a':
  NavBar: Slippery on the unsecured lock screen.