Merge "Convert keyboard ISO test to bivalent test." into main