When waiting for specific notifications we'll completely depend on robust_notification_wait() from now on *and* it will leave other notifications unlike the old version. Will-fix: #8782