Merge "Update cursor drag to snap the finger position to the handle + add slop"