Merge "Close context menu dialogs if the menu becomes empty" into klp-dev