Merge "Revert "Use the latest temperature read as base for headroom calculation"" into 24D1-dev