Merge "Fix right split screen app going to wrong target" into sc-v2-dev