Merge "Update material switch styling" into lmp-dev