Merge "Tiny fix in CellLayout"