Merge "SF: Register resync callback per event connection"