Merge "Correct PopupWindow spaceAbove calculation." into nyc-dev