Merge "Sixth (last) pass for complete CTS coverage of ListPopupWindow" into nyc-dev