binder: backport from CAF 3.4.0