Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev