Merge "Reduce calls to ConversationListFragment#onFolderUpdated" into jb-ub-mail