My take on !5302 (closed). Makes gtk handle things in a way that works for Wayland and X11, while still trying to coalesce activation and focus request APIs, and deprecates gdk_display_notify_startup_complete() in favor of plain gdk_toplevel_set_startup_id().
A partial backport could be considered for 3.24.