Merge change I587dd820 into eclair

* changes:
  Fix 2268841: Much better looking layout for pattern lock screen.