Merge \\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\" into nyc-dev am: 8afc1f70f0
am: c6413cc919

Change-Id: Ia9df6c106ab0344e6db76ad5db5a895fa8ae94e6