Merge change 25183 into eclair

* changes:
  Don't show account selection in Add Contact when no choices available.