Merge "Remove stage concept from split screen APIs" into tm-qpr-dev