Merge "Fix ListMenuItemView regression from patch 8933efd49"