Merge "Fixing bug with layout of PagedViewCellLayoutChildren"