Merge "[Settings] Fix flaky presubmit failure" into tm-dev