Merge "Fix bug 3198503 - NPE at MenuPopupHelper.dismiss"