am 4af0a709: Merge change 6555 into donut

Merge commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4'

* commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4':
  Make it so the notification manager doesn't mysteriously