am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev

* commit '79782d7ced41f548a9eac57473bd93faa4aba8b1':
  Close context menu dialogs if the menu becomes empty