[Mac]: improved cursor update and sync