Merge "ShapeNode with separate stroke and fill paints"