Merge "Cleaning up loopfilter code." into experimental