Merge "Create SkCanvas on the stack to avoid leaking memeory"