Merge "Ignore some Chooser tests that flake on races." into tm-dev