Merge pull request #6831 from manassolanki/develop

[Fix] Notification Count Issue #5987