Merge "Add ValidatedAttributionSourceState" into main