Merge change I8e7f5f07 into eclair

* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen