Returning to normal mode is tedious and confusing

Problem/Motivation

Going into click-edit mode requires just one click, but returning to the normal mode with the Manage or Shortcut menu visible requires three clicks - on different corners of the screen window, and with unclear labels.

A user can enter the quick edit mode by clicking on the "Quick edit" contextual link on a block - without using or even being aware of the "Edit" link at the top left corner. They then save their changes at the bottom of settings tray at the right hand side. To leave the "Quick edit" mode they then need to click on the "Editing" link at the top left corner, and then they need to enable the manage menu again.

The step to click "editing" to get out of the quick edit mode seems to be unnecessary because the user did not contumaciously enter that mode. Even more so because when you click "Quick edit" to edit content, then you don't get into a different mode.
Also the label "Editing" is confusing because "editing" is not what the user wants to do. In general links in Drupal describe what the user will do when they click on that link or something that they will go to. I can't think of any other button that describes what the user is currently doing. Clearer would be "Edit/Stop editing" or "Quick-edit mode/Leave edit mode".

However, if a user clicks on a link in the systems tray (for example the Advanced options to edit more block configuration, or to edit a menu item) then saving that returns them to the normal mode.

If a user edits a menu link then they are either returned to the site (if they edit custom link) or brought to the configuration page of the menu (if they edit a menu item provide by code, such as the 'Home').

Proposed resolution

(1) If a user uses the quick edit mode by just clicking on a contextual link, then saving the changes, or closing the settings tray should return them to the normal mode.
(2) If one of the menus (Manage, Shortcuts, User) are enabled when a users clicks on a quick-edit link, then they need to be enabled again when the user leaves that mode.
(3) The "Editing" label should be replaced with a label that describes what will happen when the link is clicked to be consistent with other labels.

Remaining tasks

User interface changes