Merge "Migrate materialColor* attributes into colors" into main