Merge "[DO NOT MERGE] Make the cutout slightly smaller" into sc-v2-dev