Merge "Fix highlight for RestrictedPreference" into sc-dev