Merge "Only apply server visible to split screen" into rvc-dev