Merge change Iac534225 into eclair

* changes:
  Fix issue #2186709: Can't unlock the device for a while