Merge change I1b6d202b into eclair

* changes:
  Move photo querying off main thread.