Merge "NPE in ConversationContainer" into ub-gmail-ur14-dev