Merge "Swap in a null cursor before clearing the ConversationList adapter"