Merge "Fix rendering issue with paths when the stroke width is 0"