More work on bug #8313.  Now annotations can be created from a device.