Merge "Temporary fix for 4X8 block intra prediction." into nextgenv2