Merge "Also skip test setup for tv-specific tests if not on tv"