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

Change-Id: I72d41288d2d2d780471223f7a1c29e38d7dcea34