Merge "CanvasRenderer::Shape: Remove unnecessary header" into devel/master