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

* commit '6967b6b6bcf269222cb995c5b9dad0ded6b79e08':
  When folder is changed, also update conversation list.