Merge "QueryBuilder: Remove special handling of QueryParseException"