Merge "Dispatch the actual PopupWindow dismiss callback to PopupMenu"