Merge "Decoupling the reorder logic from the CellLayout view" into tm-qpr-dev