Merge "CanvasRenderer: Remove unnecessary condition" into devel/master