Merge "Revert "Revert "Update preferences to Material Next styling""" into sc-v2-dev