Merge "Prevent setting pending bind if we are bound" into main