Merge "Update colorPrimary in watch" into cw-f-dev