Merge "ThermalManagerServiceTest: change to new callback behavior" into qt-dev