Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c am: 440137be" into oc-dr1-dev-plus-aosp