Merge "Fallback to freeform windows if split screen not supported" into oc-dev