Merge "Fix potential NPE crash in ConversationHeaderPreferenceController"