Merge "Bug 5076788 - Optimize the building and invalidation of menus"