Merge change I46ea3489 into eclair

* changes:
  Make sure we wake up the screen if the keyguard is not visible when we think it should be.