Merge "Fix ApiQueryInfo response for prop=watchers"