Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev