Merge "CanvasRenderer:: Add Picture class" into devel/master