Merge commit 'a67809918f6c212630da0b359628d0e8722b091f' * commit 'a67809918f6c212630da0b359628d0e8722b091f': Move photo querying off main thread.
Merge commit 'a67809918f6c212630da0b359628d0e8722b091f' * commit 'a67809918f6c212630da0b359628d0e8722b091f': Move photo querying off main thread.