Merge "Remove stage type from split screen APIs" into sc-v2-dev