Merge changes from topic "am-ba0d2ef2-dcc6-410d-b951-94125ac33b2c" into ub-launcher3-master

* changes:
  [automerger] Make sure notification listener stays unbound on reboot when badging disabled am: 7aa922c912
  Make sure notification listener stays unbound on reboot when badging disabled