Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev