Update Canvas before computing width. Draw turtle at end of drawing circle.

Fixes #612595. Will backport to 2.2.