Merge "Fix bug 5174277 - Trouble with Menus"