Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev