am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu."

* commit '98bfb6f797220818a4018ef5f3aa65fc074c8fc4':
  Move the menu header out of the menu.