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

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

Change-Id: I366854270fef465182ab1e8d4278d7953ce3ba9a