Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev