[fix] Handle clear notifications deadlock
Merge pull request #797 from anandpdoshi/anand-auaugst-25

[fix] Handle clear notifications deadlock