Merge "Added high bit-depth support in CLPF." into nextgenv2