Merge "Fix intra prediction ref selection in skip_encode"