Merge "Fix subsequent notifs appearing in the shade."