Merge "Use a faster approach to testing query ID reuse"