Fix prepareStep system message lost when messages is also returned#1389

TooTallNate merged 2 commits intomainvercel/workflow:mainfrom

fix/prepare-step-system-message-orderingvercel/workflow:fix/prepare-step-system-message-orderingCopy head branch name to clipboard