Merge "Separate trace of trampoline launch with different packages" into sc-dev