Merge "Fix a crash when grContext was deleted"