Merge "ext-intra: refactor mode info. writing and reading" into nextgenv2