Merge "Enable adaptive prediction mode coding" into nextgenv2