Merge "Corrected drawingTransformMatrix"