Merge "Change TV strings to work across form-factors"