If client closes but all watch streams are not canceled, the outstanding watch will wait until it is canceled, causing watch server to potentially wait forever to close. Fixes #7102