Merge "Fix work profile security challenge screen isn't properly shown" into udc-dev