Merge "Fix race condition when registering services"