Merge "ActivityOptions.set/getLaunchStackId() be gone!"