Merge "Make sure reset ConversationCursorLoader gets cleaned up" into jb-ub-mail