Merge change 23582 into eclair

* changes:
  Expand apps' control over the settings restore process