am 6bcd99c2: Merge change I1b6d202b into eclair

Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.