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