Merge "SoftAvcEnc: Added support for Constrained intra prediction."