Merge "PopupWindow: Be more consistent about Gravity calculation." into...
Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am: b19915be am: b97dc0a5
am: b48508b1
Change-Id: Ifb5fef22f2598e0229b7d37d4fb6ebf8778feb8d