Merge "Fix bug swiping away NO_CLEAR notifications."