Merge "Revert "Fix Canvas memory leak"" into mnc-ub-dev