Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded

client/start: fix logic for discarded signal