Merge "Ignore a null conversation cursor" into jb-ub-mail-ur8