Merge "Fix flaky IThermalListenerTest"