Merge "Fix unused imports in QueryShell"