Merge "Consider adjacent launch target when recycling an existing task" into tm-dev