Merge "Add upcoming ADPF flags" into main