Merge "Fix drag enter/exit reporting"