Merge changes I2e8f67e7,Ia5778bf4

* changes:
  Send DND broadcasts to approved DND apps
  Fix crash when disabling notification listeners