Merge "A few updates for TVs." into ics-mr1