get rid of the roundabout way that these popups are popup controllers
(of a kind) for real popups

for the moment keeping them as loaded from resources

Change-Id: I083e8609ab133e3dc4a036daf8bfb44c08a6719f