Merge "Re-structure probability model context for prediction filter type" into nextgenv2