Merge "Fix 2 issues related to hover event dispatching."