Merge "Update chooser colors per mocks." into udc-dev