Merge "Report isKnownService in discovery stop metrics" into main