Merge "Set Freeform corner radius to match spec" into main