Merge "Clean up ConversationCursor listeners"