Merge "Initial implementation of CellLayout auto-reordering"