am c0e1bb88: am 6d924c69: am 5b48223d: Merge change I14e833fa into eclair

Merge commit 'c0e1bb88fd3029ad8a6ab4587da7bcfb127100c7'

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