Merge "Fix problem with AsyncQueryHandler"