Set `WatchedOutput::block_hash` to `Some`

[wpaulino]

Motivated by #3822 (comment)

[tnull]

Relatedly, we might want to do #2119 when make this change, as otherwise the behavior would still be inconsistent across restarts.