Merge "Don't update SBIV dimens during NIC reordering" into main