Merge "Only handle Context submenus as dialogs when parent is a dialog"