Clear notifications where necessary, and not during clear_cache
Merge pull request #708 from anandpdoshi/notification-count-deadlock-fix

Clear notifications where necessary, and not during clear_cache