I'm not sure why this was merged. It's explicitly not T105438 - that's a much bigger piece of work that involves changing quite a bit of the rendering functionality, which is beyond the scope of this, at least as far as Roan suggested it to me. Am I missing something?