Merge "Baseline support for main/side stage split-screen model"