Fix canvas size getter
Merge branch 'Feature_Fix_Canvas_Size_Getter' into develop
Merge branch 'develop'