Merge "Support accountUri in Conversation cursor" into jb-ub-mail