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

Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb