Merge change I6238c621 into eclair

* changes:
  Prevents empty focus contacts without photo from being created.