Merge "Fix binderLibTest flakiness" into main