Merge "[1/2] Update sysui test-mapping" into main