Merge "Fix race condition in TransitionCollector." into lmp-dev