Merge change I88bb16e6 into eclair

* changes:
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices