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

Change-Id: I43a029fe125c8959bc1490fa76841b48a2bced2f