Merge "Support null service resources in ServiceWatcher" into main