Merge "Improve threaded behavior in ConversationCursor"