Issue #2165835 by yched, tstoeckler: Rename EntityDisplay to EntityViewDisplay in accordance with its interface.