Merge "Only run some ApfIntegrationTest test cases when VSR API is 34+" into main