Merge "Let the contrast API support multiple users" into udc-dev