Merge "Fix Canvas memory leak" into nyc-dev