Merge "Moving various nav-bar configs out of feature flags" into main