Merge "Initial commit of new split screen work." into sc-dev