Merge "Fix UIProvider account/folder notifications in EmailProvider"