Compensating for some toolbar changes.
Getting the toolbarMode from the annotation state manager.
Updated for latest annotation toolbar changes.
Merge remote-tracking branch 'origin/matej/toolbar-refactoring'
API changes for upcoming 3.5