Fix handling of client-provided submenus
Fix handling of client-provided submenus

concord-consortium/cloud-file-manager,concord-consortium/cloud-file-manager,concord-consortium/cloud-file-manager,concord-consortium/cloud-file-manager