Merge "Decoupling finding the solution and animation of a reorder in CellLayout" into tm-qpr-dev