Merge "Ensure all AttributionSources are deregistered in PMS" into tm-qpr-dev