Merge "Update Preference style" into sc-dev