[IMP] When preparing pack operations, use the smallest UoM of the moves if they are smaller than the default UoM. Otherwise use default UoM.

The same is done when extra moves are generated.  It is going to check if the UoM of the operation is smaller if it has one.