[OE-3945] Using wrapper views for elements and other print related changes