Merge "ListPopupWindow: Correct a negative height before showing"