Merge "Disable multi-user check for entitlement provisioning" into main