Address review comments.
Perform canvas drawing in a separate task.