Merge "Add a feature flag for USD" into main