Cancelling or finishing an annotaiton resets the current drawing tool

[matt-sd-watson]

Currently, if you are using any of the annotation tools, and either finish or cancel an annotation:

the defautt canvas behaviour switches back to pan, despite the annotation tool selection button remaining selected. This is a bit confusing, because the button needs to be re-selected, despite not changing opacity.