Merge "fallout from view::Surface / Surface split"