PopupViewAndFragment TB2 -> TB4

Change-Id: I9299d8c78e92816e368208f1cbc07b8c969a9600