Merge "Track hovering pointers explicitly -- try 2"