Merge "Fix cgroup support for recovery mode"