Merge "Merge "Revert "Revert "Update preferences to Material Next styling""" into sc-v2-dev am: 225e6ba272 am: 650fa8139a"