Merge change I6983cab3 into eclair-mr2

* changes:
  Add saving/restoring state in CredentialInstaller and ...