Merge "[Thread] fix flaky Thread settings tests" into main