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

* commit '91211072485e76e788e7fcc0e323b39ade9c6f94':
  Close context menu dialogs if the menu becomes empty