Merge "Hover and stylus API cleanup."