Merge "Fix racy DHSS=True share groups test"