Merge change Iad66a274 into eclair

* changes:
  Fix race condition in WindowManagerService.disableKeyguard()