Merge "Fix a couple issues with nav bar & rotation button" into sc-dev am: 49a841c0 am: ac26355d

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

Change-Id: Idd863f54ddff948be68033aee6d55a2700a2686d