Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"