Merge "Report sent query count in resolution stop metrics" into main