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