Merge "Use an activity instead of a fragment for SpeakEasySettings"