Merge change 25615 into eclair

* changes:
  Fix an NPE in when returning to ViewContactActivity from EditContactActivity.