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

[v0.6] Avoid blocking transaction if watcher aborted while writing #2845