Merge "Skip Boot test for TV form factor"