Merge commit '750a64aca07faf032f1e3ea40cee840d34be0d2c' * commit '750a64aca07faf032f1e3ea40cee840d34be0d2c': add DragTracker class