Merge "Add "television" mode." into honeycomb-mr2