Merge "Refactor some Preference Controllers to use BasePreferenceController"