Issue #2511582 by tim.plunkett, dsnopek: Extend BlockDisplayVariant rather than copying code from Page Manager