Fix Button[.Borderless].Colored text styling
am: c5396edd9b

Change-Id: Id47c4a7c0a99c8d72e26cd46351a6114a0ab9ac8