Merge "Fix memory leaks in Settings"