Merge "Revert "Track hovering pointers explicitly""