Merge "Use cursor position from mouse events for hit test"