Merge "Prevent session destruction on CanvasContext::destroy()" into udc-qpr-dev