Merge "Apply max intra block size condition to non-RD mode decision"