Merge "Add tracing to quick affordance binder" into main