Merge "Clear all won't clear group notifs with no clear flag"