ChannelListActivity changes
Merge