Merge "PopupWindow. Don't use -1 width/height for calculations." into nyc-dev