Merge "Address the IThermal HAL API feedback" into main