Final merge ConversationActivity and SettingsFragment