Merge "Validate AutomaticZenRule type and Condition source IntDefs" into main