Merge "Cleanup: remove unused old thermal APEX" into main