Merge "sm: repoll after handling client callbacks" into main