Merge "Support APF multi-device test" into main