Merge "Add apf_utils for multi-device tests" into main