Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev am: 5663de78 am: 0d7b35a2 am: 3cf2b953

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

Change-Id: I2187ed4e1c5ffdc82bdb02bce17c1870b73ab022