Merge "Fix for loop filter selection procedure" into nextgenv2