Merge "Fix accidental activateTexture(0)"