Fix Bug 944804 - Tie trackevent editor closing to trackevent removal rather than a separate call