Merge "Remove usage of last toolType for new startInput" into main