Merge "Improve error message for doTestContinuousQueries" into main