Merge change 6437 into donut

* changes:
  Backup / Restore locale preference.