Merge "thermal: Fix avg power calculation" into 24D1-dev