Merge "PopupWindow: fix typo in doc comment"