Fixing doubple highlight between keyboard and mouse mixed use. DEVELOPER-495
Merge pull request #475 from wesbos/DEVELOPER-495

Fixing double highlight between keyboard and mouse mixed use. DEVELOPER-495