Merge "Fix a couple issues with tracking launch cookies" into sc-dev