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

Change-Id: I8b98780208ca4e89d249fc7ebd688b868b3fb9be