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