Update annotations reducer to be able to merge state at the canvas level

Fixes #2941

This will support asynchronous annotations from multiple sources for a
canvas. Previously this worked as a last in only out.