Focus should be set back to the marker upon closing the popup

So keyboard users can continue tabbing through the markers. Without this, they must tab through everything all over again if they decide to close the popup. Extension of Issue #2199