Merge "Move UI update logic out of onFolderUpdated" into ub-mail-master