Merge "Revert "Fix a couple issues with nav bar & rotation button"" into sc-dev am: 44de40fd am: f1aa9df6 am: c83f496c

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

Change-Id: I34f55bd808a2c6140025bca61e651257c994a7b4