Merge "binder: fix coverity warnings" into main