Unified key command to open Sampler, Drum and Instrument tracks

Just upgraded from C13 to C15 and have encountered my first issue:

I have for a long time had a key command for “Edit VST Instrument”. This both opens and closes the instrument plugin window for the selected track.

It has also worked for opening the Sampler Track in the Lower Zone - although not closing it, which I know has been an annoyance for many like myself.

Now, however, this key command doesn’t open the Sampler Track, or the new Drum Track for that matter (both which have their own entry for key commands now).

I understand there are millions of issues allowing users to assign the same key command to different functions, so therefore:

Wouldn’t it make sense to have a unified key command for these - seeing as they basically do the same thing and can only apply to either one at a time anyway?

Whether this opens in a window or lower zone could surely be dictated by the setting in Preferences > Editors, but (at least if it opens in a window) I reckon it should also close that window on the same key command, like “Edit VST Instrument”. (Doing the same for the lower zone might be more complex since it’s multi-functional.)