Merge "Revert "Revert "Add public ADPF load hints with better rate limi..."" into main