Merge "Actually fix notification listeners dismissing bubbles"