Issue #2286357 by tim.plunkett: Introduce Display Variants, use for the block rendering flow.