Merge "Add more shape drawing to new reorderer/renderer"