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

Change-Id: I1ae838346c9125d08987dee62171619d6c96e96b