Merge "Add plumbing for ADPF Power Efficiency hint" into main