Merge "Fix NPE when deleting old zen rules" into sc-dev