Merge "Make PIP into split screen" into tm-qpr-dev