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

* commit '1fb6e24f19533c2d7bfa1e8e69443d752e9df3ce':
  Fix janky navbar ripples -- incorrect timerslack values