Merge "Second pass for PopupMenu tests." into nyc-dev