Merge "Preserve user customization when an app deletes and recreates an AutomaticZenRule" into main