Merge "Cleanup initialization of GrContext." into sc-dev