Merge "Refactor handling data launching split screen to separate class" into udc-dev