Merge "SF: correct runaway RegionSamplingThread timer"