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

Change-Id: I356e7202bd8939eb5543190f17893abd43c0a0a6