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