Merge "Workaround for add_tid_to_cgroup failed to write" into jb-dev