Merge "servicemanager: restart more services on crash"