Prevent stacking of notifications

Closes #3511, Closes #3512