Merge "Add CanvasView thread rasterization" into devel/master