Fix unit-only Attack move.
attackmoveUnit is more specific than attackMove, so since rP24675 won't fire at the same time. However the GUI code expected that, breaking it.
Instead, properly check for either attackmove or attackmoveUnit.
Also fix an issue with rP24675 where hotkeys would be release if switching to a more specific combination of the same hotkey.
Reported by: snelius
Fixes #5944
Differential Revision: https://code.wildfiregames.com/D3436