Merge "af-binder: Fix lock issue"