Merge "Enforce persisted snoozed notifications limits" into sc-dev