Merge "Add running state for services inside containers"