Merge "Mark breakpoint roots"