Merge "Revert "Settings recovery support""