Merge "Clean mPreviousSolution on change of CellLayout target" into tm-qpr-dev