Merge "Move texture upload behavior to TextureState"