Merge "Record who has disabled an AutomaticZenRule" into main