Merge "Fixes long screenshot landscape and split window bugs" into sc-dev am: db27afd2 am: 70e09b66 am: 0d329912

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

Change-Id: Icff6cc8271d88fe91045de3e4d976d7487ab5643