Merge "Color button text should be primary for better contrast"