Merge "Fix flakiness of testTransferLaunchCookie" into sc-v2-dev