Some TLC for topnav
Some TLC for topnav

* origin/pr/11342:
  Some TLC for topnav