Merge "Fix a bug where MenuItems would not return consistent results for item icons initialized from a drawable resource id."