Merge "Changes in PopupWindow API"