Merge "Improve resistance to leaks for ConfigEvent"