Merge "Fix work profile issue" into udc-dev