Merge "Replace use of deprecated GrDirectContext API" into main