Merge remote-tracking branches 'origin/test/10376-fix_startup-page_roadmap-test-is-fragile' and 'origin/test/11401-notification-wait-is-fragile' into testing

Fix-committed: #10376, #10497, #11398, #11401, #11464