Merge "Fix flaky TransitionManagerTest"