Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am: b19915bea8
am: b97dc0a5a8

Change-Id: I3d27d8ae4e25fdb1977e6c57ee02aa80b3a8a4ef