Merge "Fix test failure due to hanging layout" into sc-v2-dev