Merge "Fix rd_pick_partition search loop for 4x4 blocks"