Merge "Add unit test for CellLayout making sure the reorder are valid and fix Multipage CellLyout" into main