Merge "Gracefully degrade on incorrect view in ConversationList"