Merge "Fix bug in PathMeasure with trimmed paths"