Merge "interval change should restart thread reporting locations" into main