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