Merge "Don't change texture unit when not needed."