Merge "Add colorSecondary theme attribute." into nyc-mr1-dev