Merge "Add TextOnPath support to new reorderer/renderer"