Merge "[popup] remove event handler when popup is deleted"