Merge "Properly handle loading conversation list." into jb-ub-mail-ur9