Merge "Improve the shell cgroup feature"