Merge "Track active AttributionSources, and finish chains on death" into sc-dev