Merge "Ensure the menu items are properly recreated after a density change"...
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c am: b2b36285
am: 16fe3c84
Change-Id: I30465efb9d3b8fce31351c75cfe34659b39ff6ac