Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev