Merge "Support display cutout side override in tests" into main