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

Change-Id: I9794ac492099f5a359a25652a49e94ef933e4e0c