Merge commit 'e53c9a81' into eclair-mr2-plus-aosp * commit 'e53c9a81': Move photo querying off main thread.