Merge "Fix potential crash in ImageTransformState"