Merge "Make the long-deprecated detachDrawGlFunctor a no-op." into main