Merge "[People Service] Fix `hasActiveNotifications` to track when notifications are modified" into tm-qpr-dev