Merge "[Settings] Code refactor - apply BasePreferenceController"