diff -Nru snapd-2.54.3+20.04.1ubuntu0.2/data/systemd/snapd.service.in snapd-2.54.3+20.04.1ubuntu0.3/data/systemd/snapd.service.in
--- snapd-2.54.3+20.04.1ubuntu0.2/data/systemd/snapd.service.in	2022-02-15 16:45:13.000000000 +0000
+++ snapd-2.54.3+20.04.1ubuntu0.3/data/systemd/snapd.service.in	2022-04-27 16:12:11.000000000 +0000
@@ -1,5 +1,6 @@
 [Unit]
 Description=Snap Daemon
+After=snapd.socket
 Requires=snapd.socket
 OnFailure=snapd.failure.service
 # This is handled by snapd
diff -Nru snapd-2.54.3+20.04.1ubuntu0.2/debian/changelog snapd-2.54.3+20.04.1ubuntu0.3/debian/changelog
--- snapd-2.54.3+20.04.1ubuntu0.2/debian/changelog	2022-02-23 18:25:31.000000000 +0000
+++ snapd-2.54.3+20.04.1ubuntu0.3/debian/changelog	2022-04-27 16:12:51.000000000 +0000
@@ -1,3 +1,12 @@
+snapd (2.54.3+20.04.1ubuntu0.3) focal; urgency=medium
+
+  * Cherry-pick https://github.com/snapcore/snapd/pull/11680 and
+    https://github.com/snapcore/snapd/pull/11287:
+    - This fixes a bad interaction between snapd and update-notifier
+      during a release upgrade (LP: #1969162)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Apr 2022 18:12:51 +0200
+
 snapd (2.54.3+20.04.1ubuntu0.2) focal-security; urgency=medium
 
   * SECURITY REGRESSION: Fix fish shell compatibility
diff -Nru snapd-2.54.3+20.04.1ubuntu0.2/debian/rules snapd-2.54.3+20.04.1ubuntu0.3/debian/rules
--- snapd-2.54.3+20.04.1ubuntu0.2/debian/rules	2022-02-17 18:37:25.000000000 +0000
+++ snapd-2.54.3+20.04.1ubuntu0.3/debian/rules	2022-04-27 16:12:11.000000000 +0000
@@ -309,3 +309,14 @@
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using="$(BUILT_USING)" $(SUBSTVARS)
+
+override_dh_systemd_start:
+	# Due to https://github.com/systemd/systemd/issues/8102
+	# debhelper supporting --remaining like behaviour here would
+	# have been useful
+	# (Re-)start socket first
+	dh_systemd_start --restart-after-upgrade snapd.socket
+	# Then service
+	dh_systemd_start --restart-after-upgrade snapd.service
+	# Then the rest
+	dh_systemd_start --restart-after-upgrade $(filter-out snapd.socket snapd.service, $(shell ls debian/snapd/lib/systemd/system/))
diff -Nru snapd-2.54.3+20.04.1ubuntu0.2/packaging/ubuntu-16.04/changelog snapd-2.54.3+20.04.1ubuntu0.3/packaging/ubuntu-16.04/changelog
--- snapd-2.54.3+20.04.1ubuntu0.2/packaging/ubuntu-16.04/changelog	2022-02-23 18:25:31.000000000 +0000
+++ snapd-2.54.3+20.04.1ubuntu0.3/packaging/ubuntu-16.04/changelog	2022-04-27 16:12:51.000000000 +0000
@@ -1,3 +1,12 @@
+snapd (2.54.3+20.04.1ubuntu0.3) focal; urgency=medium
+
+  * Cherry-pick https://github.com/snapcore/snapd/pull/11680 and
+    https://github.com/snapcore/snapd/pull/11287:
+    - This fixes a bad interaction between snapd and update-notifier
+      during a release upgrade (LP: #1969162)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Apr 2022 18:12:51 +0200
+
 snapd (2.54.3+20.04.1ubuntu0.2) focal-security; urgency=medium
 
   * SECURITY REGRESSION: Fix fish shell compatibility
diff -Nru snapd-2.54.3+20.04.1ubuntu0.2/packaging/ubuntu-16.04/rules snapd-2.54.3+20.04.1ubuntu0.3/packaging/ubuntu-16.04/rules
--- snapd-2.54.3+20.04.1ubuntu0.2/packaging/ubuntu-16.04/rules	2022-02-17 18:37:25.000000000 +0000
+++ snapd-2.54.3+20.04.1ubuntu0.3/packaging/ubuntu-16.04/rules	2022-04-27 16:12:11.000000000 +0000
@@ -309,3 +309,14 @@
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using="$(BUILT_USING)" $(SUBSTVARS)
+
+override_dh_systemd_start:
+	# Due to https://github.com/systemd/systemd/issues/8102
+	# debhelper supporting --remaining like behaviour here would
+	# have been useful
+	# (Re-)start socket first
+	dh_systemd_start --restart-after-upgrade snapd.socket
+	# Then service
+	dh_systemd_start --restart-after-upgrade snapd.service
+	# Then the rest
+	dh_systemd_start --restart-after-upgrade $(filter-out snapd.socket snapd.service, $(shell ls debian/snapd/lib/systemd/system/))