Merge "Make new split-screen module optiional"