Merge "Refactor CanvasContext: move OpenGL specific code"