Merge "Attempt to use snapshot starting window for task trampoline" into tm-dev