Merge "Introducing CellPosMapper which allows mapping between UI position and model position" into tm-qpr-dev