Merge "fix race condition in service list compares"