Merge "Tests for PopupWindow public API change"