Fix setCanvas initializing canvas width
Merge branch 'Feature_Fix_setCanvas_Initializing_Canvas_Width' into develop