am 7c3e2696: am 1fb6e24f: Merge "Fix janky navbar ripples -- incorrect timerslack values" into mnc-dev

* commit '7c3e2696c558dbaec4ca6e7ef9fc06879c443c51':
  Fix janky navbar ripples -- incorrect timerslack values