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

Change-Id: I1d06d427c3679d83d55038f999b75c26d5c8ecc6