[v0.7] Avoid blocking transaction if watcher aborted while writing

[v0.7] Avoid blocking transaction if watcher aborted while writing #2846