Revert "Fix a couple issues with nav bar & rotation button"

This reverts commit 90d8bcf8f0a3dce01f37c7898125fa5e6cdca1b7.

Reason for revert: Causes frequent flakes in presubmit

Bug: 187033888

Change-Id: I5a64f917e78b48f72552d0d8f99caee56f912cd5
7 files changed