Merge "Fix bug in setting sf->use_square_partition_only."