Merge "sm: lazy service - fix race"