Merge "catch some cases of reading a closed MessageCursor" into jb-ub-mail