Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev