Merge "Reorder shape options, making sure that the default Circle is first." into main