Merge "Refactor HintSessionWrapper and move into CanvasContext"