Merge "drag-n-drop support for main/side stage split-screen"