Image annotation: support more shapes

[damithc]

Currently, we can use image annotation features to do something like the below (i.e., the yellow circle) to indicate which area of the image the explanation refers to.

It may be useful to be able to draw other shapes in the diagram e.g., a box