Merge "Rename a loopfilter parameter"