Merge "Don't show accounts that aren't syncing" into jb-ub-mail