Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev