Merge "Remove unnecessary buffer pointers in PICK_MODE_CONTEXT" into nextgenv2