am 264863cb: am a3f84bb2: am 6e8f47b0: Revert "Fix notification bar performance."

Merge commit '264863cb4b63decefa5040106ec9fe19e6af27d8'

* commit '264863cb4b63decefa5040106ec9fe19e6af27d8':
  Revert "Fix notification bar performance."