Merge "Fix nav bar consuming" into nyc-dev