Merge "Convert more of StatusFragment to PreferenceControllers"