Merge "Adoption of Dynamic Color tokens" into main