Merge "Make watch Switch thumb color consistent" into nyc-mr1-dev