Merge "Add compat for secondary splitscreen window option"