Merge change 27291 into eclair

* changes:
  Fix issue #2148939: Sholes slow to wake up in landscape mode