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

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