Merge "Revert "m3: update primary color tokens' value to match Material..."" into main