Merge "Fix NavBar visibility assertion"