Merge "Make sure instance launch trace for an id only appears once" into tm-dev