Merge "Fix possible rendering issue when drawing a path."