Reset canvas state before drawing annotations 

Depends on #2988.