Merge "services/identity/server: fix shutdown race"