Merge "Fix blip after notifications are swiped"