TrayIcon fixes

src/Avalonia.Controls/TrayIcon.cs

@@ -7,6 +7,7 @@
 using Avalonia.Controls.Platform;
 using Avalonia.Platform;
 using Avalonia.Reactive;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
@@ -64,12 +65,7 @@ static TrayIcon()
                 }
             });
 
-            var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
-
-            if (app.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
-            {
-                lifetime.Exit += Lifetime_Exit;
-            }
+            Dispatcher.UIThread.ShutdownStarted += ShutdownStarted;
         }
 
         /// <summary>
@@ -184,7 +180,7 @@ public bool IsVisible
 
         internal ITrayIconImpl? Impl => _impl;
 
-        private static void Lifetime_Exit(object? sender, ControlledApplicationLifetimeExitEventArgs e)
+        private static void ShutdownStarted(object? sender, EventArgs? e)
         {
             var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
             var trayIcons = GetIcons(app);

src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs

@@ -71,11 +71,11 @@ private async void WatchAsync()
                 var nameOwner = await _dBus.GetNameOwnerAsync("org.kde.StatusNotifierWatcher");
                 OnNameChange("org.kde.StatusNotifierWatcher", nameOwner);
             }
-            catch
+            catch (Exception e)
             {
                 _serviceWatchDisposable = null;
                 Logger.TryGet(LogEventLevel.Error, "DBUS")
-                    ?.Log(this, "Interface 'org.kde.StatusNotifierWatcher' is unavailable.");
+                    ?.Log(this, $"Interface 'org.kde.StatusNotifierWatcher' is unavailable.\n{e}");
             }
         }