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

Change-Id: I554dcbd9eb011d84a61d49b0d48818d1e9905c00