Merged from adrianagm-93794.
Merge branch 'adrianagm-93794_CanvasRenderer'