Merge "Fixed NPE in canAddMoreManagedProfiles"