Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"