C2LC-96: Commands and editor actions should stay active until they are toggled off or another action is activated