Merge "Workaround for PathMeasure.getSegment() behavior change" into nyc-dev