Merge "Fix Button[.Borderless].Colored text styling" into nyc-support-24.1-dev