Merge "Prevent crash when dismissing a PopupWindow that didn't have time to show up. Bug #2520981"