Merge "Fix broken layout after switched stage positions" into sc-v2-dev am:...

Merge "Fix broken layout after switched stage positions" into sc-v2-dev am: 3c96d584 am: 562b85b6

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

Change-Id: I94727a2abf22c0becf2db58c96ef2ece845303b5