Merge "Allow service auto-restarts when its dependency is force-stopped" into sc-v2-dev