Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d
am: bf91103763

Change-Id: I0fd29b6db29f87ebfd6f900b94b59eb9e21ac942