Avoid merge conflict. #12929 should be merged first

Author: fredcw

js/ui/panel.js

@@ -3670,7 +3670,7 @@ Panel.prototype = {
      */
     _updatePanelVisibility: function() {
         this._mouseEntered = this._mouseOnPanel();
-        if (this._panelEditMode || this._panelHasOpenMenus())
+        if (this._panelEditMode || this._highlighted || this._panelHasOpenMenus())
             this._shouldShow = true;
         else {
             switch (this._autohideSettings) {