Move 'notification count refresh' logic out of mapper

Change-Id: I4c10b66e537dea5f9c5bc7ccba8f558cafd103d7