Merge change 26105 into eclair

* changes:
  keystore: enable delete(), scan(), exist() when keystore is locked.