Merge "Fix text appearances not working in colored button styles" into nyc-dev