Merge "Handle trampoline activites in different tasks" into nyc-dev