Merge "Fix AddAccountSettings memory leak"