Merge "Merge "Fix sysui cts skip the cutout parts" into pie-cts-dev am: 5d33264b07"