Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c am: 440137be Change-Id: I8d6b0b9899119f7bbefc1e0048bbbe916fa9db28