Merge "New UserManagerInternal APIs for extra user / display assignment."