08f89ed9a4
Merge commit 'e0ef973b1358585d039989ee5572e16751078aaf' * commit 'e0ef973b1358585d039989ee5572e16751078aaf': * a best effort fix for apps that uses get/set Matrix API on canvas.