Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev