Do not show tool label if there is no tool on a step
Merge branch 'AI2919-track_fixes' into stable