Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev