Merge "thermal: remove vdroop1/2 for canopy compatibility" into sc-dev