Merge "Allowing launch cookies to be passed via pending activity starts" into sc-v2-dev