Merge "Fix sinlgeDevice timeout flaky test." into tm-dev