Merge "Properly check for SDK before nullifying attribution tag" into sc-dev