Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev