Merge change I9890c2d4 into eclair

* changes:
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard