am e3f7ec3e: Merge "Simplify lunch menu"

* commit 'e3f7ec3ec70177301a79bbc8eb575a990994d7c0':
  Simplify lunch menu