Merge "Fix CellLayout cast exception when drag is canceled" into sc-dev