Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2

* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
  If we fail to persist the current settings and fall back to the back settings file