Merge "Clean up tracking new roots, do not track them for CC."