Merge "Fix race condition in TransitionCollector."