Merge "Revert "Skip multi-device tests instead of abort if device is non-B+ devices"" into main