Merge "Fix ordering on work profile" into udc-dev