Merge "Fix loopfilter bug"