Merge "Fix flaky tree component tests." into main