Merge change I4898b145 into eclair

* changes:
  Removed the fixed height in the sim unlock screen's header.