Merge pull request #855 from nnnick/fix/reset-canvas

Restore original canvas context when destroying