Merge "Account sub8x8 block reference filter type for prob context" into nextgenv2