Merge "Fix borderless colored button text color" into nyc-dev