Merge "Get correct hasEnrolled for work profiles"