Merge "Unify profile and device lock by setting the work lock on the device"