Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb