am: b75a0426d8 * commit 'b75a0426d8c2339f2d552f96cc4dfcd86deb3447': DO NOT MERGE: Fix Canvas memory leak