Merge "Add explicit check to not trigger a cursor drag via the mouse"