Avoid "leaked window" errors by dismissing popups, not just hiding them, on success

Change-Id: I45a2dc6d73f5b0891fea5f1124394d286f14d314