Merge "Fix broken test on devices with cutout" into rvc-dev