Merge "Simulating a split screen CellLayout using one CellLayout" into tm-qpr-dev