Merge "Account for extra nav bar when checking nav bar appearance" into sc-v2-dev