This was incorrectly reporting the toplevel surface instead of the popup surface that was placed above it. This fixes event delivery to popups for selecting menu items and more.