binder: Sync with CAF