Merge "Revert "Fix highlight for RestrictedPreference"" into sc-dev