Fix discovery abort scenario

## Description
Fix current aborting logic with correct handling it on testhost side.
That is already implemented here #2892.
Need more debugging, testing and code review.

[AB#1338987](https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_workitems/edit/1338987)