Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled"