Merge "Enforce persisted snoozed notifications limits" into tm-qpr-dev