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

* commit 'e74dff14dc6e075e372aeedb6610243c28884610':
  Use correct row/column order in list and grid CollectionItems