Merge change 26655 into eclair

* changes:
  clear PHOTO column instead of deleting the row for focus