Merge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev