Merge "Fix NPE in makeTransformCanvas"