Merge "Only clip PopupWindow in the vertical direction" into nyc-dev