Merge "Fix split screen test case failure" into tm-qpr-dev