Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev