Merge "Fix potential IOOB error in icon reordering" into main