Merge "Ensure the ServiceTypeClient Executor threads can be shutdown" into main