Save build_server_id as soon as a build server is selected, so the cancel cleanup finds the helper container on the build server. Let the final helper stop run after a cancel. Closes #12383 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>