Merge "Mark messages seen when we view a conversation list" into jb-ub-mail-ur9