Merge "Make sure notification listener stays unbound on reboot when badging disabled" into ub-launcher3-edmonton