Merge "Add flag for switch to managed profile dialog" into udc-dev