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

Change-Id: I752695e576eae29650c3d79841b509fb267429b6