Merge "Update DisplayCutoutTests for long edge cutout" into rvc-dev