Issue #2119481 by damiankloip, xjm: Inject EntityManager dependency into UuidResolver.
Issue #2181511 by amateescu, xjm, Berdir | yched: Throw an exception when creating an EntityDisplay for a non-ContentEntity.