Merge "Fix issues with landscape transition" into rvc-dev am: f769298b am: 15923154 am: 6b8485cf

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

Change-Id: I73f609959efbbebc0873d8cc143d1cae15798cf0