Merge "Revert GC thread changes" into jb-mr2-dev