Merge "Fix bubble notifications not being removed when permission revoked" into main