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

* commit '6e435abfeb7256b5ea82ca37166acf36e3f98085':
  Move the menu header out of the menu.