Merge "Add ADPF owner for thermal" into main