af-binder: Bump to cherry picked fixes