Merge change I420cc110 into eclair-mr2

* changes:
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.