Handoff sender sends sync periodically

Duplicated version of #624 rebased from `2.0` to resolve a conflict.