Rework tray icon activation behavior yet again