Merge "Extra checks to find the source of flaky tests" into tm-dev