Merge "Fix low contrast text in add user dialog." into udc-dev