Merge "Fixes long screenshot landscape and split window bugs" into sc-dev am:...

Merge "Fixes long screenshot landscape and split window bugs" into sc-dev am: db27afd2 am: caa9e3d0

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

Change-Id: Ia87081909846d2297e87f5af046a29d7943e7be2