Merge "When folder is changed, also update conversation list." into jb-ub-mail-ur9