am 9d989c4: Don\'t show menu in oneshot mode, since it\'s not useful and m

Merge commit '9d989c480204167cf983ba4dc3eac9dec5cddef9'

* commit '9d989c480204167cf983ba4dc3eac9dec5cddef9':
  Don't show menu in oneshot mode, since it's not useful and may confuse other parts of the code.