For ENG-4519, add cancellable watch to avoid double handling truncation ...

...requests