Fix missed merge conflict on GLContext