Merge "Added more CanvasOps for various drawing commands"