Merge "Sort cfgs before rustlibs." into main