multiview: manual conflict fix after previous merge