Merge "Revert "Make Navbar Secondary Handle Appear Correctly"" into 24D1-dev