Merge "Remove lights out views from nav bar" into nyc-dev