Revert "start reducing calls to menu_clear_navigation"

This reverts commit 202b1e2006a3ca03ef5dbe161ac4a4692af77ab3.