Merge "Skip tests instead of failing when running on unsupported devices"