Merge "Redesign channel listing and channel page" into qt-dev am: 9496bce441
am: 1053e4a798

Change-Id: I863f230c5fc9e4b03a5a88b4d52b3395ea07f20c