Merge "Rename methods for PopupWindow"