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

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