Merge "Fix memory leaks in Settings" into pi-dev