Merge "Remove bg_non_interactive cgroup"