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

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

Change-Id: I79807a9890cffdd9b4c42c7aeb7f625f9228c2fa