Merge "Revert "Only apply server visible to split screen"" into rvc-dev am: cf1dd0cd49 am: b036efd958

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986789

Change-Id: I1f5bb00d9117da90ed7763f84c191c819cf8f885