Merge change 25626 into eclair

* changes:
  Check if rename of current settings file was successful before persisting new changes to settings.