Merge "Fix workspace callback binder lifecycle (2/2)" into main