Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev