am 763ccae7: Merge change I8e7f5f07 into eclair

Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-plus-aosp

* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen