Issue #2420037 by daffie: Remove EntityViewsDataInterface from some subclasses of EntityViewsData which implements EntityViewsDataInterface