Merge "Separate frame context index for different frame types" into nextgenv2