Merge "UiBench adapted for TV" into nyc-dev