Merge "Fix issues with landscape transition" into rvc-dev am: f769298b62 am: 7ea1586752

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

Change-Id: Ic705e61b446f59d7a9e686ac78fe9025688add88