Merge "Fix IsolatedUidAllocator for non-primary users."