Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread