Merge "Account for top and bottom padding in ListPopupWindow" into nyc-dev