Merge "Fix bug 4329016 - Refresh menus properly while in batch update mode"