Merge "Fix splitscreen with freeform windows" into main