Merge "Fix a race condition for temperature_logger"