Merge "Reduce intra_cost_penalty for BLOCK_8X8"