Merge "Make Navbar Secondary Handle Appear Correctly" into main