Include eventlogging for Popups

Change-Id: I7f30e943728aeab623b3207f43b291d84ae3f42d