Merge change I51ef3ab9 into eclair-mr2

* changes:
  Don't show the keyboard when you enter EditContactActivity