Merge "Store ANS token CDFs in the FRAME_CONTEXT rather than in a global table." into nextgenv2