Merge "Avoid NPE when PopupWindow is shown while dismissing"