Merge change I700622d9 into eclair

* changes:
  Fix up photo editing, and few other tweaks to contact editing.