Merge "Deringing line buffer no longer depends on holding OD_DERING_VERY_LARGE" into nextgenv2