Merge "Ensure restored (deleted+added) rules are neither active nor snoozed" into main