Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
am: b2b3628565

Change-Id: I7ba78968e6e5b6d07b0e36b83631535ad2209270