Merge "Fix theoretical memory leak in mConfigEvents"