Merge "Notify the NotificationViewWrappers whether they are shown" into main