Merge "Use mClientAttribution.uid directly in BasicClient constructor." into main