[DF-4633] Fix for double remove of UIPopup.