Merge "Attempt process kill even if cgroup is already removed" into main