Test that back to back queued notifications do not double-show
Merge branch 'master' into notif-tracking-timestamp