am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev

* commit 'd0154550e0d5e8dea5b65849747266f5fa0d2d5d':
  Deactivate notification listeners disabled at runtime.