Merge "Revert "Adapt to libprocessgroup API changes for polling on cgro..."" into main