Merge "Fix channel screen launching" into pi-dev am: a0cb928098
am: cc611845bf

Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd