Merge "Support restoring the original task ordering of transient-launches" into tm-dev