Merge "Update theme colours for watch type devices." into nyc-mr1-dev