Merge "Fix the SUW setup Pattern view the two steps offset issue" into main