Merge "Fix touch event would be offset by crop"