Merge "Remove visible notif + summary before NMS.onClick"