Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev