Merge "Always send frame size explicitly" into nextgenv2