SystemTray refactoring in preparation of supporting StatusNotifier