Merge "Revert "Fix a couple issues with nav bar & rotation button"" into sc-dev